Date: Thursday, February 26, 2015 @ 19:48:55 Author: spupykin Revision: 128312
Added: busybox/trunk/ifplugd.patch Modified: busybox/trunk/PKGBUILD busybox/trunk/busybox.install busybox/trunk/config -----------------+ PKGBUILD | 16 ++++++++-------- busybox.install | 2 +- config | 8 ++++---- ifplugd.patch | 30 ++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-26 18:40:19 UTC (rev 128311) +++ PKGBUILD 2015-02-26 18:48:55 UTC (rev 128312) @@ -4,23 +4,23 @@ pkgname=busybox pkgver=1.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") url="http://www.busybox.net" license=('GPL') -makedepends=("make" "gcc" "sed" "ncurses") +makedepends=("make" "gcc" "sed" "ncurses" "musl" "kernel-headers-musl") install=busybox.install source=("$url/downloads/$pkgname-$pkgver.tar.bz2" - "config") + "config" + ifplugd.patch) md5sums=('5c94d6301a964cd91619bd4d74605245' - 'c0312dd11188e47ab4b5e84244fdde52') + '71c99d75dda156dab162dece3bd424a5' + '187adc8319e45be12d79e8db2c514d74') prepare() { cd "$srcdir/$pkgname-$pkgver" -# for i in $srcdir/*.patch; do -# patch -p1 <$i -# done + patch -p1 <$srcdir/ifplugd.patch } build() { @@ -29,7 +29,7 @@ sed '1,1i#include <sys/resource.h>' -i include/libbb.h # if you want to run menuconfig uncomment the following line: # make menuconfig ; return 1 - make + make CC=musl-gcc } package() { Modified: busybox.install =================================================================== --- busybox.install 2015-02-26 18:40:19 UTC (rev 128311) +++ busybox.install 2015-02-26 18:48:55 UTC (rev 128312) @@ -11,5 +11,5 @@ post_upgrade() { [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox busybox rm -rf tmp/busybox.upgrade - echo "busybox is dynamically linked now." + echo "busybox needs nscd for DNS lookups." } Modified: config =================================================================== --- config 2015-02-26 18:40:19 UTC (rev 128311) +++ config 2015-02-26 18:48:55 UTC (rev 128312) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.23.1 -# Tue Jan 27 14:40:33 2015 +# Thu Feb 26 21:03:39 2015 # CONFIG_HAVE_DOT_CONFIG=y @@ -57,8 +57,8 @@ # # Build Options # -# CONFIG_STATIC is not set -CONFIG_PIE=y +CONFIG_STATIC=y +# CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set @@ -390,7 +390,7 @@ CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_REGEX_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y Added: ifplugd.patch =================================================================== --- ifplugd.patch (rev 0) +++ ifplugd.patch 2015-02-26 18:48:55 UTC (rev 128312) @@ -0,0 +1,30 @@ +networking/ifplugd.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/networking/ifplugd.c b/networking/ifplugd.c +index b578f4c..8fad69a 100644 +--- a/networking/ifplugd.c ++++ b/networking/ifplugd.c +@@ -34,16 +34,17 @@ + #include "libbb.h" + + #include "fix_u32.h" +-#include <linux/if.h> +-#include <linux/mii.h> +-#include <linux/ethtool.h> + #ifdef HAVE_NET_ETHERNET_H + # include <net/ethernet.h> + #endif ++#include <syslog.h> ++ ++#include <linux/if.h> ++#include <linux/mii.h> ++#include <linux/ethtool.h> + #include <linux/netlink.h> + #include <linux/rtnetlink.h> + #include <linux/sockios.h> +-#include <syslog.h> + + #define __user + #include <linux/wireless.h> +