diff options
Diffstat (limited to 'abs/core/mkinitcpio-busybox')
| -rw-r--r-- | abs/core/mkinitcpio-busybox/PKGBUILD | 17 | ||||
| -rw-r--r-- | abs/core/mkinitcpio-busybox/__changelog | 1 | ||||
| -rw-r--r-- | abs/core/mkinitcpio-busybox/glibc-2.16.patch | 10 | ||||
| -rw-r--r-- | abs/core/mkinitcpio-busybox/sys_resource.patch | 99 |
4 files changed, 20 insertions, 107 deletions
diff --git a/abs/core/mkinitcpio-busybox/PKGBUILD b/abs/core/mkinitcpio-busybox/PKGBUILD index 55071e0..f85beb6 100644 --- a/abs/core/mkinitcpio-busybox/PKGBUILD +++ b/abs/core/mkinitcpio-busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160678 2012-06-03 16:32:18Z dreisner $ +# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.20.1 +pkgver=1.20.2 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') @@ -12,16 +12,22 @@ license=('GPL') depends=('glibc') options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" - 'config' 'sys_resource.patch') + 'glibc-2.16.patch' + 'config') +sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882' + 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' + 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') build() { cd "$srcdir/busybox-$pkgver" - patch -Np1 < $srcdir/sys_resource.patch + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ "$srcdir/config" > .config + patch -Np1 < "$srcdir/glibc-2.16.patch" + make } @@ -30,6 +36,3 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('af2fededb6dca804544c05684636e574' - 'dd4c0fefe9bb9e65945a5b5525543fd7' - '47e725861776dbaad351e021c9a4df5a') diff --git a/abs/core/mkinitcpio-busybox/__changelog b/abs/core/mkinitcpio-busybox/__changelog deleted file mode 100644 index 25dffa3..0000000 --- a/abs/core/mkinitcpio-busybox/__changelog +++ /dev/null @@ -1 +0,0 @@ -sys_resource.patch, needed for glibc 1.15 diff --git a/abs/core/mkinitcpio-busybox/glibc-2.16.patch b/abs/core/mkinitcpio-busybox/glibc-2.16.patch new file mode 100644 index 0000000..5e2fb4f --- /dev/null +++ b/abs/core/mkinitcpio-busybox/glibc-2.16.patch @@ -0,0 +1,10 @@ +--- a/include/libbb.h.orig 2012-09-17 08:28:35.215518120 -0400 ++++ b/include/libbb.h 2012-09-17 08:28:49.807212925 -0400 +@@ -44,6 +44,7 @@ + #include <sys/stat.h> + #include <sys/time.h> + #include <sys/types.h> ++#include <sys/resource.h> + #ifndef major + # include <sys/sysmacros.h> + #endif diff --git a/abs/core/mkinitcpio-busybox/sys_resource.patch b/abs/core/mkinitcpio-busybox/sys_resource.patch deleted file mode 100644 index bd55961..0000000 --- a/abs/core/mkinitcpio-busybox/sys_resource.patch +++ /dev/null @@ -1,99 +0,0 @@ -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 06 Jul 2012 03:19:09 +0000 -Subject: include sys/resource.h where needed - -We use functions from sys/resource.h in misc applets, but don't include -the header. This breaks building with newer glibc versions, so add the -include where needed. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- -Index: busybox-1.19.4/loginutils/passwd.c -=================================================================== ---- busybox-1.19.4.orig/loginutils/passwd.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/loginutils/passwd.c 2012-07-06 17:48:27.388096092 -0700 -@@ -15,6 +15,7 @@ - - #include "libbb.h" - #include <syslog.h> -+#include <sys/resource.h> /* setrlimit */ - - static void nuke_str(char *str) - { -Index: busybox-1.19.4/miscutils/time.c -=================================================================== ---- busybox-1.19.4.orig/miscutils/time.c 2012-02-04 11:24:55.000000000 -0800 -+++ busybox-1.19.4/miscutils/time.c 2012-07-06 17:48:27.388096092 -0700 -@@ -16,6 +16,7 @@ - //usage: "\n -v Verbose" - - #include "libbb.h" -+#include <sys/resource.h> /* getrusage */ - - /* Information on the resources used by a child process. */ - typedef struct { -Index: busybox-1.19.4/networking/inetd.c -=================================================================== ---- busybox-1.19.4.orig/networking/inetd.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/networking/inetd.c 2012-07-06 17:48:54.852097259 -0700 -@@ -165,6 +165,7 @@ - //usage: "\n (default: 0 - disabled)" - - #include <syslog.h> -+#include <sys/resource.h> /* setrlimit */ - #include <sys/un.h> - - #include "libbb.h" -Index: busybox-1.19.4/networking/ntpd.c -=================================================================== ---- busybox-1.19.4.orig/networking/ntpd.c 2012-02-04 11:24:55.000000000 -0800 -+++ busybox-1.19.4/networking/ntpd.c 2012-07-06 17:48:27.392096048 -0700 -@@ -46,6 +46,7 @@ - #include "libbb.h" - #include <math.h> - #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */ -+#include <sys/resource.h> /* setpriority */ - #include <sys/timex.h> - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 -Index: busybox-1.19.4/networking/ntpd_simple.c -=================================================================== ---- busybox-1.19.4.orig/networking/ntpd_simple.c 2012-02-04 11:24:55.000000000 -0800 -+++ busybox-1.19.4/networking/ntpd_simple.c 2012-07-06 17:48:27.400095949 -0700 -@@ -7,6 +7,7 @@ - */ - #include "libbb.h" - #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */ -+#include <sys/resource.h> /* setpriority */ - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - #endif -Index: busybox-1.19.4/runit/chpst.c -=================================================================== ---- busybox-1.19.4.orig/runit/chpst.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/runit/chpst.c 2012-07-06 17:48:27.400095949 -0700 -@@ -91,6 +91,7 @@ - //usage: "\n a SIGXCPU after N seconds" - - #include "libbb.h" -+#include <sys/resource.h> /* getrlimit */ - - /* - Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. -Index: busybox-1.19.4/shell/shell_common.c -=================================================================== ---- busybox-1.19.4.orig/shell/shell_common.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/shell/shell_common.c 2012-07-06 17:48:27.400095949 -0700 -@@ -18,6 +18,7 @@ - */ - #include "libbb.h" - #include "shell_common.h" -+#include <sys/resource.h> /* getrlimit */ - - const char defifsvar[] ALIGN1 = "IFS= \t\n"; - |