summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
commit6daa792eab1488d013fefc5eb7e4d01f40f38687 (patch)
tree6391cc46bb9fc8b859d99175ea317e5fa7b37959 /package/busybox
parentadcaca72539b2ff4a5f4deee00d5f0251378ac9b (diff)
change defaults for CONFIG/BUILD/INSTALL styles
All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used.
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/busybox/config/findutils/Config.in1
-rw-r--r--package/busybox/config/networking/Config.in1
-rw-r--r--package/busybox/files/busybox.postinst2
4 files changed, 7 insertions, 1 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 8481fd64f..800042444 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,6 +18,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
${TOPDIR}/.busyboxcfg
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 1869113ca..ba2e5f557 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -8,6 +8,7 @@ menu "Finding Utilities"
config BUSYBOX_FIND
bool "find"
default y
+ depends on !ADK_PACKAGE_FINDUTILS
help
find is used to search your system to find specified files.
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 264beae90..20c583388 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -94,6 +94,7 @@ config BUSYBOX_DNSD
config BUSYBOX_ETHER_WAKE
bool "ether-wake"
default n
+ depends on !ADK_PACKAGE_ETHER_WAKE
help
Send a magic packet to wake up sleeping machines.
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 71d18be30..9f1f9987b 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -2,7 +2,7 @@
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf network network YES
add_rcconf crond crond NO
-add_rcconf watchdog watchdog YES
+add_rcconf watchdog watchdog NO
add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
add_rcconf inetd inetd NO