From 3c38bd3c2f9b74ba97a4c0b9b85e16d9396bd13b Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Tue, 30 Jun 2015 18:59:26 +0200 Subject: [PATCH] barebox: enable password support for sysmobts and sysmocom-odu This uses a new git revision to use a required fix. --- .../barebox/barebox-sysmobts/defconfig | 25 +++++++++++++------ recipes-bsp/barebox/barebox-sysmobts_git.bb | 10 +++++++- .../barebox/barebox-sysmocom-odu-mlo_git.bb | 2 +- .../barebox/barebox-sysmocom-odu/defconfig | 17 ++++++------- .../barebox/barebox-sysmocom-odu_git.bb | 10 +++++++- recipes-bsp/barebox/barebox.inc | 7 ++++++ 6 files changed, 50 insertions(+), 21 deletions(-) diff --git a/recipes-bsp/barebox/barebox-sysmobts/defconfig b/recipes-bsp/barebox/barebox-sysmobts/defconfig index 4e27290..f38af9a 100644 --- a/recipes-bsp/barebox/barebox-sysmobts/defconfig +++ b/recipes-bsp/barebox/barebox-sysmobts/defconfig @@ -126,7 +126,13 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y # CONFIG_MENU is not set -# CONFIG_PASSWORD is not set +CONFIG_PASSWORD=y +CONFIG_PASSWORD_DEFAULT="" +# CONFIG_PASSWD_SUM_MD5 is not set +CONFIG_PASSWD_SUM_SHA1=y +# CONFIG_PASSWD_SUM_SHA256 is not set +# CONFIG_PASSWD_SUM_SHA512 is not set +# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y @@ -251,7 +257,7 @@ CONFIG_CMD_RM=y CONFIG_CMD_RMDIR=y # CONFIG_CMD_SHA1SUM is not set # CONFIG_CMD_SHA224SUM is not set -CONFIG_CMD_SHA256SUM=y +# CONFIG_CMD_SHA256SUM is not set # CONFIG_CMD_SHA384SUM is not set # CONFIG_CMD_SHA512SUM is not set # CONFIG_CMD_UNCOMPRESS is not set @@ -285,7 +291,11 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set +CONFIG_CMD_LOGIN=y +CONFIG_CMD_PASSWD=y +# CONFIG_PASSWD_MODE_HIDE is not set +CONFIG_PASSWD_MODE_STAR=y +# CONFIG_PASSWD_MODE_CLEAR is not set # CONFIG_CMD_SPLASH is not set CONFIG_CMD_READLINE=y CONFIG_CMD_TIMEOUT=y @@ -551,14 +561,13 @@ CONFIG_LIBMTD=y # CONFIG_CRC32=y CONFIG_DIGEST=y -CONFIG_SHA224=y -CONFIG_SHA256=y +CONFIG_SHA1=y # CONFIG_DIGEST_MD5_GENERIC is not set -# CONFIG_DIGEST_SHA1_GENERIC is not set +CONFIG_DIGEST_SHA1_GENERIC=y # CONFIG_DIGEST_SHA224_GENERIC is not set -CONFIG_DIGEST_SHA256_GENERIC=y +# CONFIG_DIGEST_SHA256_GENERIC is not set # CONFIG_DIGEST_SHA384_GENERIC is not set # CONFIG_DIGEST_SHA512_GENERIC is not set # CONFIG_DIGEST_HMAC_GENERIC is not set # CONFIG_DIGEST_SHA1_ARM is not set -CONFIG_DIGEST_SHA256_ARM=y +# CONFIG_DIGEST_SHA256_ARM is not set diff --git a/recipes-bsp/barebox/barebox-sysmobts_git.bb b/recipes-bsp/barebox/barebox-sysmobts_git.bb index 3a44d54..e5c599a 100644 --- a/recipes-bsp/barebox/barebox-sysmobts_git.bb +++ b/recipes-bsp/barebox/barebox-sysmobts_git.bb @@ -1,6 +1,6 @@ require barebox.inc -SRCREV = "05d4d07f387fbcbfd5c719792ccfeb3e4aef5a2a" +SRCREV = "9f78d1b7a7c31a8c67423ab8ac9839f4ba2f5df7" SRC_URI = " \ git://git.sysmocom.de/barebox.git;branch=v2015.06 \ file://defconfig \ @@ -14,6 +14,14 @@ BAREBOX_ELF_SYMLINK ?= "barebox-${MACHINE}.elf" BAREBOX_BIN_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.bin" BAREBOX_BIN_SYMLINK ?= "barebox-${MACHINE}.bin" +# generated using echo -n 'bts-stop' | sha1sum +BAREBOX_PASSWORD = "5a7ef8875df28cb95a0f833906f94df8573bcc5d" + +do_configure_append () { + mkdir -p ${WORKDIR}/env/nv + echo 5 > ${WORKDIR}/env/nv/login.timeout +} + do_deploy_append () { install -d ${DEPLOYDIR} install ${S}/arch/arm/pbl/zbarebox ${DEPLOYDIR}/${BAREBOX_ELF_IMAGE} diff --git a/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb b/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb index bf457cc..280110f 100644 --- a/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb +++ b/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb @@ -1,6 +1,6 @@ require barebox.inc -SRCREV = "05d4d07f387fbcbfd5c719792ccfeb3e4aef5a2a" +SRCREV = "9f78d1b7a7c31a8c67423ab8ac9839f4ba2f5df7" SRC_URI = " \ git://git.sysmocom.de/barebox.git;branch=v2015.06 \ file://defconfig \ diff --git a/recipes-bsp/barebox/barebox-sysmocom-odu/defconfig b/recipes-bsp/barebox/barebox-sysmocom-odu/defconfig index 3f5f8f9..f93f0ed 100644 --- a/recipes-bsp/barebox/barebox-sysmocom-odu/defconfig +++ b/recipes-bsp/barebox/barebox-sysmocom-odu/defconfig @@ -144,10 +144,10 @@ CONFIG_MENU=y CONFIG_PASSWORD=y CONFIG_PASSWORD_DEFAULT="" # CONFIG_PASSWD_SUM_MD5 is not set -# CONFIG_PASSWD_SUM_SHA1 is not set +CONFIG_PASSWD_SUM_SHA1=y # CONFIG_PASSWD_SUM_SHA256 is not set # CONFIG_PASSWD_SUM_SHA512 is not set -CONFIG_PASSWD_CRYPTO_PBKDF2=y +# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y # CONFIG_TIMESTAMP is not set @@ -318,8 +318,8 @@ CONFIG_CMD_MENU=y # CONFIG_CMD_MENU_MANAGEMENT is not set CONFIG_CMD_MENUTREE=y CONFIG_CMD_PASSWD=y -CONFIG_PASSWD_MODE_HIDE=y -# CONFIG_PASSWD_MODE_STAR is not set +# CONFIG_PASSWD_MODE_HIDE is not set +CONFIG_PASSWD_MODE_STAR=y # CONFIG_PASSWD_MODE_CLEAR is not set # CONFIG_CMD_SPLASH is not set CONFIG_CMD_READLINE=y @@ -614,15 +614,12 @@ CONFIG_CRC16=y CONFIG_DIGEST=y CONFIG_MD5=y CONFIG_SHA1=y -CONFIG_SHA224=y -CONFIG_SHA256=y -CONFIG_DIGEST_MD5_GENERIC=y -# CONFIG_DIGEST_SHA1_GENERIC is not set +# CONFIG_DIGEST_MD5_GENERIC is not set +CONFIG_DIGEST_SHA1_GENERIC=y # CONFIG_DIGEST_SHA224_GENERIC is not set # CONFIG_DIGEST_SHA256_GENERIC is not set # CONFIG_DIGEST_SHA384_GENERIC is not set # CONFIG_DIGEST_SHA512_GENERIC is not set # CONFIG_DIGEST_HMAC_GENERIC is not set # CONFIG_DIGEST_SHA1_ARM is not set -CONFIG_DIGEST_SHA256_ARM=y -CONFIG_CRYPTO_PBKDF2=y +# CONFIG_DIGEST_SHA256_ARM is not set diff --git a/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb b/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb index 07f24af..d231415 100644 --- a/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb +++ b/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb @@ -2,7 +2,7 @@ require barebox.inc RDEPENDS_${PN} += "${PN}-mlo" -SRCREV = "05d4d07f387fbcbfd5c719792ccfeb3e4aef5a2a" +SRCREV = "9f78d1b7a7c31a8c67423ab8ac9839f4ba2f5df7" SRC_URI = " \ git://git.sysmocom.de/barebox.git;branch=v2015.06 \ file://defconfig \ @@ -14,6 +14,14 @@ S = "${WORKDIR}/git" BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.img" BAREBOX_SYMLINK ?= "barebox-${MACHINE}.img" +# generated using echo -n 'odu-stop' | sha1sum +BAREBOX_PASSWORD = "45cd62a2c4b834d6f8077db04f024aec070801db" + +do_configure_append () { + mkdir -p ${WORKDIR}/env/nv + echo 5 > ${WORKDIR}/env/nv/login.timeout +} + do_deploy_append () { install -d ${DEPLOYDIR} install ${S}/images/barebox-am33xx-sysmocom-odu.img ${DEPLOYDIR}/${BAREBOX_IMAGE} diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc index 4000e30..79b4285 100644 --- a/recipes-bsp/barebox/barebox.inc +++ b/recipes-bsp/barebox/barebox.inc @@ -20,6 +20,13 @@ do_configure_prepend() { echo CONFIG_BAREBOXCRC32_TARGET=n >> ${S}/.config echo CONFIG_KERNEL_INSTALL_TARGET=n >> ${S}/.config echo CONFIG_IMD_TARGET=n >> ${S}/.config + # password + if [ -n "${BAREBOX_PASSWORD}" ]; then + echo -n "${BAREBOX_PASSWORD}" > ${S}/.password + echo CONFIG_PASSWORD_DEFAULT=\".password\" >> ${S}/.config + fi + # extra environment files + sed -i -e 's,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$,\1 ../env\",' ${S}/.config oe_runmake oldconfig }