From 0b9830a337e938216d2a19e92159588bf4885746 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 8 Feb 2010 22:14:22 +0100 Subject: busybox: trim superfluous trailing whitespace from .inc file Signed-off-by: Bernhard Reutner-Fischer --- recipes/busybox/busybox.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 519fcd6f39..7f67f479c9 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -55,7 +55,7 @@ FILES_${PN} += "${datadir}/udhcpc" INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd" INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" INITSCRIPT_NAME_${PN}-syslog = "syslog" -INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" +INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf" # This disables the syslog startup links in slugos (see slugos-init) @@ -137,7 +137,7 @@ pkg_postinst_${PN} () { # (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";; /*) to="/bin/busybox";; esac; busybox ln -s $to $link; fi; done Date: Thu, 11 Feb 2010 12:16:06 +0100 Subject: busybox: use machine specific hwclock.sh for hipox At hipox machine we do not update the Hardware Clock with the System Clock time at stop to avoid needless increase of the RTC epoch counter. Signed-off-by: Steffen Sledz --- recipes/busybox/files/hipox/hwclock.sh | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 recipes/busybox/files/hipox/hwclock.sh (limited to 'recipes/busybox') diff --git a/recipes/busybox/files/hipox/hwclock.sh b/recipes/busybox/files/hipox/hwclock.sh new file mode 100644 index 0000000000..47e4c8d44e --- /dev/null +++ b/recipes/busybox/files/hipox/hwclock.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# hwclock.sh Set system clock to hardware clock, according to the UTC +# setting in /etc/default/rcS (see also rcS(5)). +# (hipox machine version) +# +# WARNING: If your hardware clock is not in UTC/GMT, this script +# must know the local time zone. This information is +# stored in /etc/localtime. This might be a problem if +# your /etc/localtime is a symlink to something in +# /usr/share/zoneinfo AND /usr isn't in the root +# partition! The workaround is to define TZ either +# in /etc/default/rcS, or in the proper place below. + +[ ! -x /sbin/hwclock ] && exit 0 + +. /etc/default/rcS + +[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime + +case "$1" in + start) + if [ "$VERBOSE" != no ] + then + echo "System time was `date`." + echo "Setting the System Clock using the Hardware Clock as reference..." + fi + + if [ "$HWCLOCKACCESS" != no ] + then + if [ -z "$TZ" ] + then + hwclock -s $UTC;# --hctosys + else + TZ="$TZ" hwclock -s $UTC;# --hctosys + fi + fi + + if [ "$VERBOSE" != no ] + then + echo "System Clock set. System local time is now `date`." + fi + ;; + stop|restart|reload|force-reload) + # + # At hipox machine we do not update the Hardware Clock + # with the System Clock time to avoid needless increase + # of the RTC epoch counter. + # + exit 0 + ;; + show) + if [ "$HWCLOCKACCESS" != no ] + then + hwclock -r $UTC;# --show + fi + ;; + *) + echo "Usage: hwclock.sh {start|stop|show|reload|restart}" >&2 + echo " start sets kernel (system) clock from hardware (RTC) clock" >&2 + echo " stop and reload set hardware (RTC) clock from kernel (system) clock" >&2 + exit 1 + ;; +esac -- cgit v1.2.3 From 9b78d1403a5c6fbabee24f61f6fd05542e071089 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 10 Feb 2010 21:12:57 +0100 Subject: busybox: use .tar.bz2 Switch to new-style checksums and remove all checksums for tarballs from checksums.ini Signed-off-by: Bernhard Reutner-Fischer --- recipes/busybox/busybox.inc | 1 - recipes/busybox/busybox_1.11.3.bb | 4 +++- recipes/busybox/busybox_1.13.2.bb | 4 +++- recipes/busybox/busybox_1.14.3.bb | 6 +++--- recipes/busybox/busybox_1.15.3.bb | 4 +++- recipes/busybox/busybox_1.2.1.bb | 7 ++++++- recipes/busybox/busybox_1.2.2.bb | 7 ++++++- recipes/busybox/busybox_1.3.1.bb | 6 +++++- recipes/busybox/busybox_1.7.2.bb | 4 +++- recipes/busybox/busybox_1.9.2.bb | 4 +++- 10 files changed, 35 insertions(+), 12 deletions(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 7f67f479c9..5f5285043b 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -14,7 +14,6 @@ PRIORITY = "required" INC_PR = "r24" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb index 0ec753f951..838e1bd54f 100644 --- a/recipes/busybox/busybox_1.11.3.bb +++ b/recipes/busybox/busybox_1.11.3.bb @@ -2,7 +2,7 @@ require busybox.inc PR = "${INC_PR}.1" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ file://udhcpscript.patch;patch=1 \ file://B921600.patch;patch=1 \ @@ -23,6 +23,8 @@ SRC_URI = "\ file://mdev \ file://mdev.conf \ " +SRC_URI[tarball.md5sum] = "4355ad8bb57ce3b39ad827566c1a6da3" +SRC_URI[tarball.sha256sum] = "6d35fda668988c06f8c22e6e20fe6951ec83108169df6b8c0bad99872577c784" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 18d49ba45a..d22819e7d4 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -2,7 +2,7 @@ require busybox.inc PR = "${INC_PR}.1" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-1.13.2-awk.patch;patch=1 \ file://busybox-1.13.2-depmod.patch;patch=1 \ file://busybox-1.13.2-init.patch;patch=1 \ @@ -36,6 +36,8 @@ SRC_URI = "\ file://mdev \ file://mdev.conf \ " +SRC_URI[tarball.md5sum] = "9e2a604d18bef219a5a6bf3acf78b9e1" +SRC_URI[tarball.sha256sum] = "927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" diff --git a/recipes/busybox/busybox_1.14.3.bb b/recipes/busybox/busybox_1.14.3.bb index 8d45e1e880..d714310368 100644 --- a/recipes/busybox/busybox_1.14.3.bb +++ b/recipes/busybox/busybox_1.14.3.bb @@ -4,7 +4,7 @@ PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz;name=tarball \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ @@ -27,8 +27,8 @@ SRC_URI = "\ file://mdev.conf \ " -SRC_URI[tarball.md5sum] = "dfb197b8de260ff284f7222ed23614fe" -SRC_URI[tarball.sha256sum] = "b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163" +SRC_URI[tarball.md5sum] = "d170bf5f97a41aec3a505eab690d5699" +SRC_URI[tarball.sha256sum] = "e94df4f9063a1951b4e94e76148ed80e921737a89d97bc2c310a2a8927982e90" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb index 3f8e40c6ec..b638f9c373 100644 --- a/recipes/busybox/busybox_1.15.3.bb +++ b/recipes/busybox/busybox_1.15.3.bb @@ -2,7 +2,7 @@ require busybox.inc PR = "${INC_PR}.0" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ @@ -24,6 +24,8 @@ SRC_URI = "\ file://mdev \ file://mdev.conf \ " +SRC_URI[tarball.md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240" +SRC_URI[tarball.sha256sum] = "d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" diff --git a/recipes/busybox/busybox_1.2.1.bb b/recipes/busybox/busybox_1.2.1.bb index 3630a4662b..037584a198 100644 --- a/recipes/busybox/busybox_1.2.1.bb +++ b/recipes/busybox/busybox_1.2.1.bb @@ -2,9 +2,14 @@ require busybox.inc PR = "${INC_PR}.1" -SRC_URI += "file://wget-long-options.patch;patch=1 \ +SRC_URI += "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + \ + file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ file://defconfig" +SRC_URI[tarball.md5sum] = "362b3dc0f2023ddfda901dc1f1a74391" +SRC_URI[tarball.sha256sum] = "c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410" SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch;patch=1" do_configure () { diff --git a/recipes/busybox/busybox_1.2.2.bb b/recipes/busybox/busybox_1.2.2.bb index 43a15d0f57..c160635998 100644 --- a/recipes/busybox/busybox_1.2.2.bb +++ b/recipes/busybox/busybox_1.2.2.bb @@ -4,8 +4,13 @@ PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "file://wget-long-options.patch;patch=1 \ +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + \ + file://wget-long-options.patch;patch=1 \ file://defconfig" +SRC_URI[tarball.md5sum] = "ae8a4c65b9464c8ece3483a3d3b9544c" +SRC_URI[tarball.sha256sum] = "4de9fb2bb018e381e64199b38d90cb25e71366c37a8995e9ab5ed206ebcb972f" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe diff --git a/recipes/busybox/busybox_1.3.1.bb b/recipes/busybox/busybox_1.3.1.bb index e0fd63bf5f..a6a79c9327 100644 --- a/recipes/busybox/busybox_1.3.1.bb +++ b/recipes/busybox/busybox_1.3.1.bb @@ -4,7 +4,11 @@ PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "file://defconfig" +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + file://defconfig" +SRC_URI[tarball.md5sum] = "571531cfa83726947ccb566de017ad4f" +SRC_URI[tarball.sha256sum] = "5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe diff --git a/recipes/busybox/busybox_1.7.2.bb b/recipes/busybox/busybox_1.7.2.bb index 8ce081f82f..4bfd5e6d53 100644 --- a/recipes/busybox/busybox_1.7.2.bb +++ b/recipes/busybox/busybox_1.7.2.bb @@ -1,7 +1,7 @@ require busybox.inc PR = "${INC_PR}.1" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ @@ -15,6 +15,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-appletlib-dependency.patch;patch=1 \ file://umount.busybox \ file://run_parts.c" +SRC_URI[tarball.md5sum] = "c91ec9756e2000073a9dd8fa9fc3f89e" +SRC_URI[tarball.sha256sum] = "83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf" SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;patch=1 \ http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;patch=1 \ diff --git a/recipes/busybox/busybox_1.9.2.bb b/recipes/busybox/busybox_1.9.2.bb index cd9b6ab7a3..5e8e65a314 100644 --- a/recipes/busybox/busybox_1.9.2.bb +++ b/recipes/busybox/busybox_1.9.2.bb @@ -1,7 +1,7 @@ require busybox.inc PR = "${INC_PR}.1" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ file://sort-z-nul.patch;patch=1;status=upstream \ @@ -18,6 +18,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://syslog.conf \ file://umount.busybox \ file://defconfig" +SRC_URI[tarball.md5sum] = "7e26c56012dd5811251c2f87786b9a77" +SRC_URI[tarball.sha256sum] = "a14ca1104242953672807f5b5223de5615c237a27140f36d625b3067daaf11dc" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" -- cgit v1.2.3 From 50252aaaf762894484f11a95cf0d0f9822f38a6f Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 10 Feb 2010 21:12:53 +0100 Subject: busybox: some more !getopt_long fixes in hwclock.sh busybox' hwclock can be built without support for getopt_long. Flags of the big hwclock are compatible with the busybox version. Signed-off-by: Bernhard Reutner-Fischer --- recipes/busybox/files/hwclock.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/files/hwclock.sh b/recipes/busybox/files/hwclock.sh index 6c0af3422c..f9c9f9f2c2 100644 --- a/recipes/busybox/files/hwclock.sh +++ b/recipes/busybox/files/hwclock.sh @@ -14,7 +14,7 @@ . /etc/default/rcS -[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime +[ "$UTC" = yes ] && UTC=-u || UTC=-l case "$1" in start) @@ -28,9 +28,9 @@ case "$1" in then if [ -z "$TZ" ] then - hwclock -s $UTC;# --hctosys + hwclock -s $UTC else - TZ="$TZ" hwclock -s $UTC;# --hctosys + TZ="$TZ" hwclock -s $UTC fi fi @@ -53,7 +53,7 @@ case "$1" in fi if [ "$HWCLOCKACCESS" != no ] then - hwclock -w $UTC;# --systohc + hwclock -w $UTC fi if [ "$VERBOSE" != no ] then @@ -64,7 +64,7 @@ case "$1" in show) if [ "$HWCLOCKACCESS" != no ] then - hwclock -r $UTC;# --show + hwclock -r $UTC fi ;; *) -- cgit v1.2.3 From 4372ec830acc84a51947ad0dba51484977d9e801 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 26 Feb 2010 11:35:32 -0700 Subject: busybox: If FEATURE_SUID=y, ship a SUID busybox, bump PR A number of applets will select FEATURE_SUID, and then not work unless the busybox binary is SUID. We switch from a "let the users decide" to "let the users opt-out". Signed-off-by: Tom Rini Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi --- recipes/busybox/busybox.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 5f5285043b..b165d0f34a 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r24" +INC_PR = "r25" SRC_URI = "\ file://busybox-cron \ @@ -96,7 +96,11 @@ do_install () { # Install /bin/busybox, and the /bin/sh link so the postinst script # can run. Let update-alternatives handle the rest. install -d ${D}${base_bindir} - install -m 0755 ${S}/busybox ${D}${base_bindir} + if grep -q "CONFIG_FEATURE_SUID=y" ${WORKDIR}/defconfig; then + install -m 4755 ${S}/busybox ${D}${base_bindir} + else + install -m 0755 ${S}/busybox ${D}${base_bindir} + fi ln -sf busybox ${D}${base_bindir}/sh if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then -- cgit v1.2.3 From b80195157362d5dcbb5158bb098ec45dea4af4ff Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 10 Feb 2010 10:35:34 +0000 Subject: busybox: wget accept and ignore --no-check-certificate needed for self-hosting; applied to upstream Signed-off-by: Bernhard Reutner-Fischer Acked-by: Marcin Juszkiewicz --- .../busybox-1.15.3/0000-wget-no-check-certificate.patch | 12 ++++++++++++ recipes/busybox/busybox_1.15.3.bb | 1 + 2 files changed, 13 insertions(+) create mode 100644 recipes/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch b/recipes/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch new file mode 100644 index 0000000000..c737f172b1 --- /dev/null +++ b/recipes/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch @@ -0,0 +1,12 @@ +diff --git a/networking/wget.c b/networking/wget.c +index 9d813dc..09edd67 100644 +--- a/networking/wget.c ++++ b/networking/wget.c +@@ -546,6 +546,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv) + "passive-ftp\0" No_argument "\xff" + "header\0" Required_argument "\xfe" + "post-data\0" Required_argument "\xfd" ++ "no-check-certificate\0" No_argument "\xfc" + ; + #endif + diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb index b638f9c373..1e1aa1e32a 100644 --- a/recipes/busybox/busybox_1.15.3.bb +++ b/recipes/busybox/busybox_1.15.3.bb @@ -9,6 +9,7 @@ SRC_URI = "\ file://B921600.patch;patch=1 \ file://get_header_tar.patch;patch=1 \ file://busybox-appletlib-dependency.patch;patch=1 \ + file://0000-wget-no-check-certificate.patch;patch=1 \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ -- cgit v1.2.3 From 289532f00787c2e3181628beb452ca83eabd2c11 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 5 Mar 2010 12:35:17 +0100 Subject: busybox: use u-a for /etc/default/mountall (collision with util-linux-ng-mountall) Signed-off-by: Martin Jansa --- recipes/busybox/busybox.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index b165d0f34a..d1904a6dbc 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r25" +INC_PR = "r26" SRC_URI = "\ file://busybox-cron \ @@ -39,7 +39,7 @@ PACKAGES =+ "${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd" # listed in the NEEDED field. RRECOMMENDS += "libgcc" -FILES_${PN}-mountall = "${sysconfdir}/default/mountall" +FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}" RDEPENDS_${PN} += "${PN}-mountall" # Make busybox recommend busybox-syslog for those images that expect it @@ -128,7 +128,7 @@ do_install () { fi if grep "CONFIG_FEATURE_MOUNT_FSTAB=y" ${WORKDIR}/defconfig; then install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/ + install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/mountall.${PN} fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir} @@ -145,6 +145,13 @@ pkg_postinst_${PN} () { while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links } +pkg_postinst_${PN}-mountall () { + update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 50 +} +pkg_prerm_${PN}-mountall () { + update-alternatives --remove default_mountall mountall.${PN} +} + 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 From 6064bd27781b00a4c9526d57a2cbd5c4f31642d9 Mon Sep 17 00:00:00 2001 From: sledz Date: Tue, 2 Mar 2010 11:47:21 +0000 Subject: busybox: syslog to file instead of buffer for hipox machine by default Signed-off-by: Steffen Sledz --- recipes/busybox/files/hipox/syslog.conf | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 recipes/busybox/files/hipox/syslog.conf (limited to 'recipes/busybox') diff --git a/recipes/busybox/files/hipox/syslog.conf b/recipes/busybox/files/hipox/syslog.conf new file mode 100644 index 0000000000..b45cd459d4 --- /dev/null +++ b/recipes/busybox/files/hipox/syslog.conf @@ -0,0 +1,9 @@ +DESTINATION="file" # log destinations (buffer file remote) +MARKINT=20 # interval between --mark-- entries [min] +REDUCE=no # reduced-size logging +BUFFERSIZE=64 # buffer: size of circular buffer [kByte] +LOGFILE=/var/log/messages # file: where to log +ROTATESIZE=64 # file: rotate log if grown beyond X [kByte] (busybox 1.2+) +ROTATEGENS=1 # file: keep X generations of rotated logs (busybox 1.2+) +REMOTE=loghost:514 # remote: where to log +FOREGROUND=no # run in foreground (don't use!) -- cgit v1.2.3 From 6c60b59640f592bb3172fc55db85164b589668c3 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 15:39:31 -0400 Subject: busybox: update LICENSE to more specific GPLv2 --- recipes/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/busybox') diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index d1904a6dbc..1ee263ad90 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -7,7 +7,7 @@ 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" +LICENSE = "GPLv2" SECTION = "base" PRIORITY = "required" -- cgit v1.2.3