Mercurial > hg > aboriginal
changeset 964:edf9264f2d26
Make root filesystem's usr/src has config-linux and config-uClibc as well as config-busybox.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Tue, 02 Feb 2010 04:46:07 -0600 |
| parents | dc25f0cbf93f |
| children | bcab030a2394 |
| files | root-filesystem.sh sources/sections/linux-headers.sh sources/sections/uClibc.build |
| diffstat | 3 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/root-filesystem.sh Tue Feb 02 02:52:13 2010 -0600 +++ b/root-filesystem.sh Tue Feb 02 04:46:07 2010 -0600 @@ -127,6 +127,10 @@ fi # native compiler +# This is allowed to fail if there are no configs. + +mv "$STAGE_DIR/config-"* "$STAGE_DIR/src" 2>/dev/null + # Clean up and package the result if [ -z "$SKIP_STRIP" ]
--- a/sources/sections/linux-headers.sh Tue Feb 02 02:52:13 2010 -0600 +++ b/sources/sections/linux-headers.sh Tue Feb 02 04:46:07 2010 -0600 @@ -2,6 +2,20 @@ setupfor linux +# This isn't strictly necessary, but if we have a kernel config, expand +# and copy it. + +cp "$(getconfig linux)" mini.conf && +if [ "$SYSIMAGE_TYPE" == "initramfs" ] +then + echo "CONFIG_BLK_DEV_INITRD=y" >> mini.conf +fi +[ -e mini.conf ] && +make ARCH=${BOOT_KARCH:-$KARCH} KCONFIG_ALLCONFIG=mini.conf $LINUX_FLAGS \ + allnoconfig >/dev/null && +cp .config "$STAGE_DIR/config-linux" + + # Install Linux kernel headers (for use by uClibc). make -j $CPUS headers_install ARCH="${KARCH}" INSTALL_HDR_PATH="$STAGE_DIR" && # This makes some very old package builds happy.
--- a/sources/sections/uClibc.build Tue Feb 02 02:52:13 2010 -0600 +++ b/sources/sections/uClibc.build Tue Feb 02 04:46:07 2010 -0600 @@ -22,14 +22,9 @@ # Build and install make KCONFIG_ALLCONFIG="$WORK/mini.conf" allnoconfig && -cp .config "$WORK/config-uClibc" && +cp .config "$STAGE_DIR/config-uClibc" && make_uClibc install || dienow -if [ -d "$ROOT_TOPDIR/src" ] -then - cp "${WORK}/config-uClibc" "$ROOT_TOPDIR/src/config-uClibc" || dienow -fi - # Do we need host or target versions of ldd and such? if [ ! -z "$HOST_UTILS" ]