diff --git a/base/busybox/broken.config b/base/busybox/broken.config new file mode 100644 index 000000000..27a4f41ef --- /dev/null +++ b/base/busybox/broken.config @@ -0,0 +1,4 @@ +# broken applets +O CONFIG_READAHEAD +O CONFIG_TASKSET +O CONFIG_ETHER_WAKE diff --git a/base/busybox/busybox.conf b/base/busybox/busybox.conf index 38006f7a8..f361ab951 100644 --- a/base/busybox/busybox.conf +++ b/base/busybox/busybox.conf @@ -22,18 +22,38 @@ done . $base/package/*/uclibc/conffiles-functions.in runconf=0 +var_append conffiles ' ' "$builddir/.config" + hook_add premake 1 'busybox_config' busybox_config() { local BB_arch=$( echo $arch | arch2uname ) + # generate default config rules + default_config > $builddir/.config + eval $MAKE defconfig ARCH=$BB_arch conffiles_loop 2 ARCH=$BB_arch } -# add basic config -var_append conffiles ' ' "$confdir/busybox.config" +default_config() { + echo "O CONFIG_MAKEDEVS" -[ "$SDECFG_STATIC" != 1 ] || var_append conffiles ' ' "$confdir/static.config" + if [ "$SDECFG_STATIC" == 1 ]; then + echo "X CONFIG_STATIC" + else + echo "O CONFIG_STATIC" + echo "X CONFIG_BUILD_LIBBUSYBOX" + fi + + if [ "$SDECFG_PKG_BUSYBOX_ET" = 1 ] ; then + echo "X CONFIG_PREFIX \"${SDECFG_PKG_BUSYBOX_ET_DIR#/}\"" + elif [ "$SDECFG_PKG_BUSYBOX_SYMLINKS" = 0 ] ; then + echo "X CONFIG_INSTALL_APPLET_DONT" + echo "X CONFIG_PREFIX \"${root:-/}\"" + else + echo "X CONFIG_PREFIX \"${root:-/}\"" + fi +} # add custom/target configuration from $targetdir if [ -e $targetdir/busybox.config ] ; then @@ -48,18 +68,7 @@ if [ "$SDECFG_PKG_BUSYBOX_ET" = 1 ] ; then var_append conffiles ' ' "$confdir/emergency.config" fi -# FIXME: shouldn't emergency thing force the symlinks creation? (on config.in) - -if [ "$SDECFG_PKG_BUSYBOX_SYMLINKS" = 0 ] ; then - makeinstopt='' - hook_add postmake 5 'cp -v busybox $root/$bindir' -else - if [ "$SDECFG_PKG_BUSYBOX_ET" = 1 ] ; then - var_append makeinstopt ' ' "CONFIG_PREFIX=${SDECFG_PKG_BUSYBOX_ET_DIR#/}" - else - var_append makeinstopt ' ' "CONFIG_PREFIX=$root" - fi -fi +var_append conffiles ' ' $confdir/broken.config # save .config file for the future hook_add postdoc 9 'cp -v .config busybox.links $root/$docdir' diff --git a/base/busybox/busybox.config b/base/busybox/busybox.config deleted file mode 100644 index 88b468ea4..000000000 --- a/base/busybox/busybox.config +++ /dev/null @@ -1,13 +0,0 @@ -# No DEVFS support -O CONFIG_DEVFS -O CONFIG_DEVFSD - -# No archean hardcoded /dev either -O CONFIG_MAKEDEVS - -# broken applets -O CONFIG_READAHEAD -O CONFIG_TASKSET -O CONFIG_ETHER_WAKE - -X CONFIG_DEVPTS diff --git a/base/busybox/static.config b/base/busybox/static.config deleted file mode 100644 index 7b785370a..000000000 --- a/base/busybox/static.config +++ /dev/null @@ -1,2 +0,0 @@ -X CONFIG_STATIC -X CONFIG_DISABLE_SHARED