wok-next rev 19631
busybox: dietlibc build is smaller than uclibc build, then aufs compatible
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Feb 09 11:25:50 2017 +0100 (2017-02-09) |
parents | c1675701c99f |
children | 35de7edc73ac |
files | busybox/receipt busybox/stuff/1.26/diet.u |
line diff
1.1 --- a/busybox/receipt Thu Feb 09 00:58:44 2017 +0200 1.2 +++ b/busybox/receipt Thu Feb 09 11:25:50 2017 +0100 1.3 @@ -8,14 +8,12 @@ 1.4 LICENSE="GPL2" 1.5 WEB_SITE="https://busybox.net/" 1.6 HOST_ARCH="i486 arm" 1.7 -AUFS_NOT_RAMFS="uclibc-cross-compiler-i486 is not compatible with aufs+tmpfs 8(" 1.8 1.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.10 WGET_URL="${WEB_SITE}downloads/$TARBALL" 1.11 1.12 DEPENDS="slitaz-base-files glibc-base ncurses" 1.13 -BUILD_DEPENDS="bzip2 gettext perl pam pam-dev uclibc-cross-compiler-i486 \ 1.14 -musl-libc-dev" # dietlibc 1.15 +BUILD_DEPENDS="bzip2 gettext perl pam pam-dev musl-libc-dev dietlibc" 1.16 1.17 SPLIT="busybox-boot busybox-pam busybox-static ssfs-busybox busybox-slish" 1.18 1.19 @@ -87,7 +85,7 @@ 1.20 mv docs/busybox.1 docs/busybox.pam.1 1.21 1.22 # prepare busybox-static package 1.23 - if [ -x /usr/bin/uclibc-i486-gcc ]; then 1.24 + if [ -n "$(/usr/bin/uclibc-i486-gcc --version 2>/dev/null)" ]; then 1.25 echo "Making busybox-uclibc" 1.26 cp $stuff/${VERSION%.*}/.config-static .config 1.27 sed -i 's|# CONFIG_ASH_INTERNAL_GLOB is not set|CONFIG_ASH_INTERNAL_GLOB=y|' .config
2.1 --- a/busybox/stuff/1.26/diet.u Thu Feb 09 00:58:44 2017 +0200 2.2 +++ b/busybox/stuff/1.26/diet.u Thu Feb 09 11:25:50 2017 +0100 2.3 @@ -1,11 +1,12 @@ 2.4 ---- busybox-1.25/include/platform.h 2.5 -+++ busybox-1.25/include/platform.h 2.6 -@@ -501,6 +501,20 @@ 2.7 +--- busybox-1.26/include/platform.h 2.8 ++++ busybox-1.26/include/platform.h 2.9 +@@ -501,6 +501,21 @@ 2.10 # undef HAVE_NET_ETHERNET_H 2.11 #endif 2.12 2.13 +#if defined(__dietlibc__) 2.14 +# define __aligned_u64 __u64 __attribute__((aligned(8))) 2.15 ++# define O_CLOEXEC 02000000 2.16 +# define LOOP_SET_STATUS64 0x4C04 2.17 +# define LOOP_GET_STATUS64 0x4C05 2.18 +# define MAXSYMLINKS 20 2.19 @@ -21,8 +22,8 @@ 2.20 /* 2.21 * Now, define prototypes for all the functions defined in platform.c 2.22 * These must come after all the HAVE_* macros are defined (or not) 2.23 ---- busybox-1.25/networking/ping.c 2.24 -+++ busybox-1.25/networking/ping.c 2.25 +--- busybox-1.26/networking/ping.c 2.26 ++++ busybox-1.26/networking/ping.c 2.27 @@ -30,6 +30,84 @@ 2.28 #include "libbb.h" 2.29 #include "common_bufsiz.h"