From 378b7ec5b0c5dd38ec0d7d4e69c4078e6c22acca Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 Dec 2006 12:53:30 +0000
Subject: busybox: unify

---
 packages/busybox/busybox.inc      | 64 +++++++++++++++++++++++++
 packages/busybox/busybox_1.00.bb  | 98 ++++++++-------------------------------
 packages/busybox/busybox_1.01.bb  | 92 +++++++-----------------------------
 packages/busybox/busybox_1.2.0.bb | 74 ++---------------------------
 packages/busybox/busybox_1.2.1.bb | 69 ++-------------------------
 packages/busybox/busybox_1.2.2.bb | 69 ++-------------------------
 6 files changed, 109 insertions(+), 357 deletions(-)
 create mode 100644 packages/busybox/busybox.inc

(limited to 'packages')

diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc
new file mode 100644
index 0000000000..37a9676257
--- /dev/null
+++ b/packages/busybox/busybox.inc
@@ -0,0 +1,64 @@
+DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
+small executable. It provides minimalist replacements for most of the \
+utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
+in BusyBox generally have fewer options than their full-featured GNU \
+cousins; however, the options that are included provide the expected \
+functionality and behave very much like their GNU counterparts. BusyBox \
+provides a fairly complete POSIX environment for any small or embedded \
+system."
+HOMEPAGE = "http://www.busybox.net"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "required"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+           file://busybox-cron \
+	   file://busybox-httpd \
+	   file://busybox-udhcpd \
+	   file://default.script \
+	   file://dhcp-hostname.patch;patch=1 \
+           file://hwclock.sh \
+	   file://ifupdown-spurious-environ.patch;patch=1 \
+	   file://mount.busybox \
+	   file://syslog \
+	   file://syslog.conf \
+	   file://udhcpscript.patch;patch=1 \
+	   file://umount.busybox"
+
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+
+export EXTRA_CFLAGS = "${CFLAGS}"
+EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
+PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
+
+FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
+FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
+
+FILES_${PN} += " ${datadir}/udhcpc"
+
+INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
+INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
+INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
+INITSCRIPT_NAME_${PN} = "syslog"
+CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
+
+# This disables the syslog startup links in openslug (see openslug-init)
+INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
+
+inherit cml1 update-rc.d
+
+do_compile () {
+	unset CFLAGS
+	base_do_compile
+}
+
+pkg_postinst_${PN} () {
+	# If we are not making an image we create links for the utilities that doesn't exist
+	# so the update-alternatives script will get the utilities it needs
+	# (update-alternatives have no problem replacing links later anyway)
+	test -n 2> /dev/null || alias test='busybox test'
+	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
+	
+	# This adds the links, remember that this has to work when building an image too, hence the $D
+	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
+}
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 296c4e080e..76c487be04 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -1,85 +1,36 @@
-DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
-small executable. It provides minimalist replacements for most of the \
-utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
-in BusyBox generally have fewer options than their full-featured GNU \
-cousins; however, the options that are included provide the expected \
-functionality and behave very much like their GNU counterparts. BusyBox \
-provides a fairly complete POSIX environment for any small or embedded \
-system."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
+require busybox.inc
+
 PR = "r37"
 
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-           file://add-getkey-applet.patch;patch=1 \
-	   file://udhcpscript.patch;patch=1 \
-	   file://dhcpretrytime.patch;patch=1 \
-	   file://hdparm_M.patch;patch=1 \
-	   file://udhcppidfile.patch;patch=1 \
-	   file://udhcppidfile-breakage.patch;patch=1 \
-	   file://readlink.patch;patch=1 \
-	   file://iproute-flush-cache.patch;patch=1;pnum=0 \
-	   file://rmmod.patch;patch=1 \
-	   file://df.patch;patch=1 \
-	   file://below.patch;patch=1 \
-	   file://fbset.patch;patch=1 \
-	   file://mount-all-type.patch;patch=1 \
-	   file://dhcp-hostname.patch;patch=1 \
-	   file://gzip-spurious-const.patch;patch=1 \
-	   file://ifupdown-spurious-environ.patch;patch=1 \
-           file://uclibc_posix.patch;patch=1 \
-	   file://unzip-enhancement-and-fixes.patch;patch=1;pnum=0 \
-	   file://unzip-endian-fixes.patch;patch=1;pnum=0 \
-	   file://start-stop-daemon-oknodo-support.patch;patch=1 \
+SRC_URI += "file://add-getkey-applet.patch;patch=1 \
+           file://below.patch;patch=1 \
            file://defconfig \
-           file://busybox-cron \
-	   file://busybox-httpd \
-	   file://busybox-udhcpd \
-	   file://syslog \
-           file://hwclock.sh \
-	   file://default.script \
-	   file://syslog.conf \
-	   file://mount.busybox \
-	   file://umount.busybox"
+           file://df.patch;patch=1 \
+           file://dhcpretrytime.patch;patch=1 \
+           file://fbset.patch;patch=1 \
+           file://gzip-spurious-const.patch;patch=1 \
+           file://hdparm_M.patch;patch=1 \
+           file://iproute-flush-cache.patch;patch=1;pnum=0 \
+           file://mount-all-type.patch;patch=1 \
+           file://readlink.patch;patch=1 \
+           file://rmmod.patch;patch=1 \
+           file://start-stop-daemon-oknodo-support.patch;patch=1 \
+           file://uclibc_posix.patch;patch=1 \
+           file://udhcppidfile-breakage.patch;patch=1 \
+           file://udhcppidfile.patch;patch=1 \
+           file://unzip-endian-fixes.patch;patch=1;pnum=0 \
+           file://unzip-enhancement-and-fixes.patch;patch=1;pnum=0"
 
-SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 SRC_URI_append_mtx-1 = " file://linux-types.patch;patch=1"
 SRC_URI_append_mtx-2 = " file://linux-types.patch;patch=1"
 
 S = "${WORKDIR}/busybox-${PV}"
 
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
-
-FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-
-FILES_${PN} += " ${datadir}/udhcpc"
-
-INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
-INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
-INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
-INITSCRIPT_NAME_${PN} = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-
-# This disables the syslog startup links in slugos (see slugos-init)
-INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
-
-inherit cml1 update-rc.d
-
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 	cml1_do_configure
 }
 
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-}
-
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	oe_runmake 'PREFIX=${D}' install
@@ -138,17 +89,6 @@ do_install () {
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
 }
 
-pkg_postinst_${PN} () {
-	# If we are not making an image we create links for the utilities that doesn't exist
-	# so the update-alternatives script will get the utilities it needs
-	# (update-alternatives have no problem replacing links later anyway)
-	test -n 2> /dev/null || alias test='busybox test'
-	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
-	
-	# This adds the links, remember that this has to work when building an image too, hence the $D
-	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
-}
-
 pkg_prerm_${PN} () {
 	# This is so you can make busybox commit suicide - removing busybox with no other packages
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 9c8b7e60c3..49766ef243 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -1,81 +1,32 @@
-DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
-small executable. It provides minimalist replacements for most of the \
-utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
-in BusyBox generally have fewer options than their full-featured GNU \
-cousins; however, the options that are included provide the expected \
-functionality and behave very much like their GNU counterparts. BusyBox \
-provides a fairly complete POSIX environment for any small or embedded \
-system."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
+require busybox.inc
+
 PR = "r12"
 
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-	   file://udhcppidfile.patch;patch=1 \
-	   file://udhcppidfile-breakage.patch;patch=1 \
-           file://add-getkey-applet.patch;patch=1 \
-	   file://below.patch;patch=1 \
-	   file://dhcp-hostname.patch;patch=1 \
-	   file://dhcpretrytime.patch;patch=1 \
-	   file://fbset.patch;patch=1 \
-	   file://hdparm_M.patch;patch=1 \
-	   file://ifupdown-spurious-environ.patch;patch=1 \
-	   file://iproute-flush-cache.patch;patch=1;pnum=0 \
-	   file://mount-all-type.patch;patch=1 \
-	   file://readlink.patch;patch=1 \
-	   file://rmmod.patch;patch=1 \
-	   file://udhcpscript.patch;patch=1 \
-	   file://thumb-bsdlabel.patch;patch=1 \
-	   file://glibc2.4-icmp6.patch;patch=1 \
-           file://uclibc_posix.patch;patch=1 \
+SRC_URI += "file://add-getkey-applet.patch;patch=1 \
+           file://below.patch;patch=1 \
            file://defconfig \
-           file://busybox-cron \
-	   file://busybox-httpd \
-	   file://busybox-udhcpd \
-	   file://syslog \
-           file://hwclock.sh \
-	   file://default.script \
-	   file://syslog.conf \
-	   file://mount.busybox \
-	   file://umount.busybox"
+           file://dhcpretrytime.patch;patch=1 \
+           file://fbset.patch;patch=1 \
+           file://glibc2.4-icmp6.patch;patch=1 \
+           file://hdparm_M.patch;patch=1 \
+           file://iproute-flush-cache.patch;patch=1;pnum=0 \
+           file://mount-all-type.patch;patch=1 \
+           file://readlink.patch;patch=1 \
+           file://rmmod.patch;patch=1 \
+           file://thumb-bsdlabel.patch;patch=1 \
+           file://uclibc_posix.patch;patch=1 \
+           file://udhcppidfile-breakage.patch;patch=1 \
+           file://udhcppidfile.patch;patch=1"
 
 SRC_URI_append_slugos += " file://sysctl.conf "
-SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 
 S = "${WORKDIR}/busybox-${PV}"
 
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
-
-FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-
-FILES_${PN} += " ${datadir}/udhcpc"
-
-INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
-INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
-INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
-INITSCRIPT_NAME_${PN} = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-
-# This disables the syslog startup links in slugos (see slugos-init)
-INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
-
-inherit cml1 update-rc.d
-
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 	cml1_do_configure
 }
 
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-}
-
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	oe_runmake 'PREFIX=${D}' install
@@ -138,17 +89,6 @@ do_install_append_slugos() {
 	install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}
 }
 
-pkg_postinst_${PN} () {
-	# If we are not making an image we create links for the utilities that doesn't exist
-	# so the update-alternatives script will get the utilities it needs
-	# (update-alternatives have no problem replacing links later anyway)
-	test -n 2> /dev/null || alias test='busybox test'
-	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
-	
-	# This adds the links, remember that this has to work when building an image too, hence the $D
-	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
-}
-
 pkg_prerm_${PN} () {
 	# This is so you can make busybox commit suicide - removing busybox with no other packages
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb
index d537406d08..a4157082e8 100644
--- a/packages/busybox/busybox_1.2.0.bb
+++ b/packages/busybox/busybox_1.2.0.bb
@@ -1,63 +1,11 @@
-DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
-small executable. It provides minimalist replacements for most of the \
-utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
-in BusyBox generally have fewer options than their full-featured GNU \
-cousins; however, the options that are included provide the expected \
-functionality and behave very much like their GNU counterparts. BusyBox \
-provides a fairly complete POSIX environment for any small or embedded \
-system."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
-PR = "r1"
+require busybox.inc
 
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-#	   file://udhcppidfile.patch;patch=1 \
-#	   file://udhcppidfile-breakage.patch;patch=1 \
-#	   file://below.patch;patch=1 \
-	   file://dhcp-hostname.patch;patch=1 \
-#	   file://fbset.patch;patch=1 \
-#	   file://hdparm_M.patch;patch=1 \
-	   file://ifupdown-spurious-environ.patch;patch=1 \
-#	   file://mount-all-type.patch;patch=1 \
-#	   file://rmmod.patch;patch=1 \
-	   file://udhcpscript.patch;patch=1 \
-           file://defconfig \
-           file://busybox-cron \
-	   file://busybox-httpd \
-	   file://busybox-udhcpd \
-	   file://syslog \
-           file://hwclock.sh \
-	   file://default.script \
-	   file://syslog.conf \
-	   file://mount.busybox \
-	   file://umount.busybox"
+PR = "r1"
 
-SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+SRC_URI += "file://defconfig"
 
 S = "${WORKDIR}/busybox-1.2.0"
 
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
-
-FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-
-FILES_${PN} += " ${datadir}/udhcpc"
-
-INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
-INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
-INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
-INITSCRIPT_NAME_${PN} = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-
-# This disables the syslog startup links in openslug (see openslug-init)
-INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
-
-inherit cml1 update-rc.d
-
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
 
@@ -70,11 +18,6 @@ do_configure () {
 	cml1_do_configure
 }
 
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-}
-
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	oe_runmake "PREFIX=${D}" install
@@ -136,17 +79,6 @@ do_install () {
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
 }
 
-pkg_postinst_${PN} () {
-	# If we are not making an image we create links for the utilities that doesn't exist
-	# so the update-alternatives script will get the utilities it needs
-	# (update-alternatives have no problem replacing links later anyway)
-	test -n 2> /dev/null || alias test='busybox test'
-	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
-	
-	# This adds the links, remember that this has to work when building an image too, hence the $D
-	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
-}
-
 pkg_prerm_${PN} () {
 	# This is so you can make busybox commit suicide - removing busybox with no other packages
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 9893a17285..36ffd0311c 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,54 +1,9 @@
-DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
-small executable. It provides minimalist replacements for most of the \
-utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
-in BusyBox generally have fewer options than their full-featured GNU \
-cousins; however, the options that are included provide the expected \
-functionality and behave very much like their GNU counterparts. BusyBox \
-provides a fairly complete POSIX environment for any small or embedded \
-system."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
-PR = "r9"
-
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-	   file://dhcp-hostname.patch;patch=1 \
-	   file://ifupdown-spurious-environ.patch;patch=1 \
-	   file://udhcpscript.patch;patch=1 \
-	   file://wget-long-options.patch;patch=1 \
-           file://defconfig \
-           file://busybox-cron \
-	   file://busybox-httpd \
-	   file://busybox-udhcpd \
-	   file://syslog \
-           file://hwclock.sh \
-	   file://default.script \
-	   file://syslog.conf \
-	   file://mount.busybox \
-	   file://umount.busybox"
-
-SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
-
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
-
-FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-
-FILES_${PN} += " ${datadir}/udhcpc"
+require busybox.inc
 
-INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
-INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
-INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
-INITSCRIPT_NAME_${PN} = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-
-# This disables the syslog startup links in openslug (see openslug-init)
-INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
+PR = "r9"
 
-inherit cml1 update-rc.d
+SRC_URI += "file://wget-long-options.patch;patch=1 \
+           file://defconfig"
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
@@ -62,11 +17,6 @@ do_configure () {
 	cml1_do_configure
 }
 
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-}
-
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	oe_runmake "PREFIX=${D}" install
@@ -128,17 +78,6 @@ do_install () {
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
 }
 
-pkg_postinst_${PN} () {
-	# If we are not making an image we create links for the utilities that doesn't exist
-	# so the update-alternatives script will get the utilities it needs
-	# (update-alternatives have no problem replacing links later anyway)
-	test -n 2> /dev/null || alias test='busybox test'
-	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
-	
-	# This adds the links, remember that this has to work when building an image too, hence the $D
-	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
-}
-
 pkg_prerm_${PN} () {
 	# This is so you can make busybox commit suicide - removing busybox with no other packages
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 706e7ca3b5..5206d60ccc 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,56 +1,9 @@
-DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \
-small executable. It provides minimalist replacements for most of the \
-utilities you usually find in GNU fileutils, shellutils, etc. The utilities \
-in BusyBox generally have fewer options than their full-featured GNU \
-cousins; however, the options that are included provide the expected \
-functionality and behave very much like their GNU counterparts. BusyBox \
-provides a fairly complete POSIX environment for any small or embedded \
-system."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
-PR = "r0"
+require busybox.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-	   file://dhcp-hostname.patch;patch=1 \
-	   file://ifupdown-spurious-environ.patch;patch=1 \
-	   file://udhcpscript.patch;patch=1 \
-	   file://wget-long-options.patch;patch=1 \
-           file://defconfig \
-           file://busybox-cron \
-	   file://busybox-httpd \
-	   file://busybox-udhcpd \
-	   file://syslog \
-           file://hwclock.sh \
-	   file://default.script \
-	   file://syslog.conf \
-	   file://mount.busybox \
-	   file://umount.busybox"
-
-SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
-
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
-
-FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
-
-FILES_${PN} += " ${datadir}/udhcpc"
-
-INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
-INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
-INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
-INITSCRIPT_NAME_${PN} = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-
-# This disables the syslog startup links in openslug (see openslug-init)
-INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
-
-inherit cml1 update-rc.d
+SRC_URI = "file://wget-long-options.patch;patch=1 \
+           file://defconfig"
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
@@ -64,11 +17,6 @@ do_configure () {
 	cml1_do_configure
 }
 
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-}
-
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	oe_runmake "PREFIX=${D}" install
@@ -130,17 +78,6 @@ do_install () {
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
 }
 
-pkg_postinst_${PN} () {
-	# If we are not making an image we create links for the utilities that doesn't exist
-	# so the update-alternatives script will get the utilities it needs
-	# (update-alternatives have no problem replacing links later anyway)
-	test -n 2> /dev/null || alias test='busybox test'
-	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
-	
-	# This adds the links, remember that this has to work when building an image too, hence the $D
-	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
-}
-
 pkg_prerm_${PN} () {
 	# This is so you can make busybox commit suicide - removing busybox with no other packages
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
-- 
cgit v1.2.3