Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compose the default environment from multiple env* directories #93

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compose the default environment from multiple env* directories #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ce9922
barebox: simplify defconfig condition
vivien Oct 13, 2021
17866ef
barebox: merge all env* directories
vivien Sep 14, 2021
a1fdbce
barebox: set firmware directory at configure time
vivien Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions recipes-bsp/barebox/barebox.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit kernel-arch deploy
inherit cml1

DEPENDS = "libusb1-native lzop-native bison-native flex-native"
DEPENDS = "libusb1-native lzop-native bison-native flex-native rsync-native"

PACKAGES += "${PN}-bareboxenv ${PN}-bareboxcrc32 ${PN}-kernel-install \
${PN}-bareboximd"
Expand Down Expand Up @@ -46,42 +46,38 @@ EXTRA_OEMAKE = " \
BUILDSYSTEM_VERSION=${BAREBOX_BUILDSYSTEM_VERSION} \
"

BAREBOX_FIRMWARE_DIR ?= ""
BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory (CONFIG_EXTRA_FIRMWARE_DIR) with this path"

do_configure() {
if [ -e ${WORKDIR}/defconfig ]; then
cp ${WORKDIR}/defconfig ${B}/.config
elif [ -n "${BAREBOX_CONFIG}" ]; then
oe_runmake ${BAREBOX_CONFIG}
else
if [ -n "${BAREBOX_CONFIG}" ]; then
oe_runmake ${BAREBOX_CONFIG}
else
bbfatal "No defconfig given. Either add file 'file://defconfig' to SRC_URI or set BAREBOX_CONFIG"
fi
bbfatal "No defconfig given. Either add file 'file://defconfig' to SRC_URI or set BAREBOX_CONFIG"
fi

${S}/scripts/kconfig/merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
cml1_do_configure
}

BAREBOX_FIRMWARE_DIR ?= ""
BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory (CONFIG_EXTRA_FIRMWARE_DIR) with this path"

do_compile () {
# If there is an 'env' directory, append its content
# to the compiled environment
if [ -d ${WORKDIR}/env/ ]; then \
mkdir -p ${S}/.yocto-defaultenv
cp -r ${WORKDIR}/env/* ${S}/.yocto-defaultenv/; \
grep -q .yocto-defaultenv ${B}/.config || \
sed -i -e "s,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$,\1 .yocto-defaultenv\"," \
${B}/.config; \

fi
# Merge 'env*' directories into the compiled environment
mkdir -p ${S}/.defaultenv
find ${WORKDIR} -mindepth 1 -maxdepth 1 -type d -name 'env*' -execdir rsync -av '{}/' ${S}/.defaultenv ';'
echo "CONFIG_DEFAULT_ENVIRONMENT_PATH=\"${S}/.defaultenv\"" > ${B}/.defaultenv.cfg

# If ${BAREBOX_FIRMWARE_DIR} is set, use that for CONFIG_EXTRA_FIRMWARE_DIR
touch ${B}/.firmware.cfg
if [ -n "${BAREBOX_FIRMWARE_DIR}" ]; then
sed -i -e "s,^\(CONFIG_EXTRA_FIRMWARE_DIR=\"\).*\"$,\1${BAREBOX_FIRMWARE_DIR}\"," \
${B}/.config
echo "CONFIG_EXTRA_FIRMWARE_DIR=\"${BAREBOX_FIRMWARE_DIR}\"" > ${B}/.firmware.cfg
fi

${S}/scripts/kconfig/merge_config.sh -m ${B}/.config \
${B}/.defaultenv.cfg \
${B}/.firmware.cfg \
${@" ".join(find_cfgs(d))}

cml1_do_configure
}

do_compile () {
# Barebox uses pkg-config only for building native tools
export PKG_CONFIG_LIBDIR="${STAGING_DIR_NATIVE}${libdir}/pkgconfig:${STAGING_DIR_NATIVE}/usr/share/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR=
Expand Down