wok-6.x rev 21763

busybox: enable CONFIG_FDISK_SUPPORT_LARGE_DISKS
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jun 27 14:19:03 2019 +0200 (2019-06-27)
parents c9d02f08d860
children 9a1f50677074
files busybox/receipt busybox/stuff/busybox-1.31.config
line diff
     1.1 --- a/busybox/receipt	Thu Jun 27 13:32:09 2019 +0200
     1.2 +++ b/busybox/receipt	Thu Jun 27 14:19:03 2019 +0200
     1.3 @@ -60,7 +60,7 @@
     1.4  			echo "cook: CROSS_COMPILE=$CROSS_COMPILE"
     1.5  			apply_bb_patchs &&
     1.6  			cp $stuff/arm/$PACKAGE.config .config
     1.7 -			make oldconfig &&
     1.8 +			make oldconfig | sed 's|ERROR|error|' &&
     1.9  			make && make install || return 1
    1.10  			chmod 4755 $src/_install/bin/busybox ;;
    1.11  		x86_64) echo "TODO" ;;
    1.12 @@ -68,7 +68,7 @@
    1.13  			echo "=== Build busybox ==="
    1.14  			sed -i 's|uname -m|echo i486|' Makefile
    1.15  			apply_bb_patchs &&
    1.16 -			make oldconfig &&
    1.17 +			make oldconfig | sed 's|ERROR|error|' &&
    1.18  			make && make install || return 1
    1.19  		    strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr \
    1.20  				$src/_install/bin/busybox
    1.21 @@ -78,7 +78,7 @@
    1.22  			# prepare busybox-pam package
    1.23  			echo "=== Build busybox-pam ==="
    1.24  		    sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
    1.25 -		    make oldconfig && make || return 1
    1.26 +		    make oldconfig | sed 's|ERROR|error|' && make || return 1
    1.27  		    strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr busybox
    1.28  		    mv busybox busybox-pam
    1.29  		    mv busybox_unstripped.map busybox-pam.map
    1.30 @@ -89,7 +89,7 @@
    1.31  			echo "=== Build busybox-uclibc ==="
    1.32  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.33  			sed -i 's/# CONFIG_ASH_INTERNAL_GLOB is not set/CONFIG_ASH_INTERNAL_GLOB=y/' .config
    1.34 -			make oldconfig && make || return 1
    1.35 +			make oldconfig | sed 's|ERROR|error|' && make || return 1
    1.36  			cp busybox busybox-static
    1.37  			mv busybox busybox-uclibc
    1.38  			mv busybox_unstripped.map busybox-uclibc.map
    1.39 @@ -101,7 +101,8 @@
    1.40  			# prepare busybox-musl package
    1.41  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.42  			sed -i 's|uclibc-i486-||' .config
    1.43 -			make oldconfig && make CC=musl-gcc || return 1
    1.44 +			make oldconfig | sed 's|ERROR|error|' &&
    1.45 +			make CC=musl-gcc || return 1
    1.46  			mv busybox busybox-musl
    1.47  			mv busybox_unstripped.map busybox-musl.map
    1.48  			mv -f docs/busybox.1 docs/busybox.static.1
    1.49 @@ -112,7 +113,8 @@
    1.50  			# prepare busybox-diet package
    1.51  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.52  			sed -i 's|uclibc-i486-||;s|CFLAGS="|&-D_BSD_SOURCE |;s|LDFLAGS="|&-Wl,--allow-multiple-definition |;s|LDLIBS="|&compat rpc |' .config
    1.53 -			make oldconfig && make CC="/usr/lib/diet/bin/diet gcc" || return 1
    1.54 +			make oldconfig | sed 's|ERROR|error|' &&
    1.55 +			make CC="/usr/lib/diet/bin/diet gcc" || return 1
    1.56  			mv busybox busybox-diet
    1.57  			mv busybox_unstripped.map busybox-diet.map
    1.58  			mv -f docs/busybox.1 docs/busybox.static.1
    1.59 @@ -123,7 +125,7 @@
    1.60  		    rootfs=$src/ssfs-busybox/usr/share/ssfs/rootfs
    1.61  		    mkdir -p $rootfs/etc
    1.62  		    cp $stuff/$PACKAGE-${VERSION%.*}.config-ssfs .config
    1.63 -		    make oldconfig && make busybox &&
    1.64 +		    make oldconfig | sed 's|ERROR|error|' && make busybox &&
    1.65  		    make CONFIG_PREFIX=$rootfs install || return 1
    1.66  		    mv busybox_unstripped.map busybox-ssfs.map
    1.67  		    cp $stuff/busybox.conf-ssfs $rootfs/etc/busybox.conf
     2.1 --- a/busybox/stuff/busybox-1.31.config	Thu Jun 27 13:32:09 2019 +0200
     2.2 +++ b/busybox/stuff/busybox-1.31.config	Thu Jun 27 14:19:03 2019 +0200
     2.3 @@ -600,7 +600,7 @@
     2.4  CONFIG_FBVNC=y
     2.5  CONFIG_FDFORMAT=y
     2.6  CONFIG_FDISK=y
     2.7 -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
     2.8 +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
     2.9  CONFIG_FEATURE_FDISK_WRITABLE=y
    2.10  # CONFIG_FEATURE_AIX_LABEL is not set
    2.11  # CONFIG_FEATURE_SGI_LABEL is not set