wok-next diff linux/receipt @ rev 20726
python: remove previously added '--without-ensurepip' (it made an opposite action)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon May 28 15:07:14 2018 +0300 (2018-05-28) |
parents | efd5fe5db61e |
children | 99d51a8e04a8 |
line diff
1.1 --- a/linux/receipt Wed Feb 21 22:09:42 2018 +0200 1.2 +++ b/linux/receipt Mon May 28 15:07:14 2018 +0300 1.3 @@ -57,6 +57,11 @@ 1.4 # --nonomods : Skip bzImage without modules build 1.5 # 1.6 1.7 +# CONFIG_PAGE_TABLE_ISOLATION 1.8 +# against Meltdown currently available in 4.14 only for x86_64 architecture. 1.9 +# CONFIG_RETPOLINE 1.10 +# against Spectre v.2 available both for i386 and x86_64 architectures. 1.11 + 1.12 # Handle multiarch installation. ARM use Busybox modutils, so avoid any 1.13 # deps on kmod. SLITAZ_ARCH can have also custom post_install commands 1.14 if [ -f $root/etc/slitaz/slitaz.conf ]; then 1.15 @@ -69,9 +74,10 @@ 1.16 # Rules to configure and make the package. 1.17 compile_rules() { 1.18 case $ARCH in 1.19 - i?86) ConfigFile="$stuff/linux-slitaz.config";; 1.20 - x86_64) ConfigFile="$stuff/linux-slitaz64.config";; 1.21 - arm*) ConfigFile="$stuff/arm/linux-arm.config";; 1.22 + # Linux don't supported i386 CPU, but ARCH should be 'i386' if we need 32bit CPU support 1.23 + i?86) ConfigFile="$stuff/linux-slitaz.config"; Arch='i386';; 1.24 + x86_64) ConfigFile="$stuff/linux-slitaz64.config"; Arch='x86_64';; 1.25 + arm*) ConfigFile="$stuff/arm/linux-arm.config"; Arch='arm';; 1.26 esac 1.27 1.28 # Update sources to the $VERSION using base sources ($KBASEVER) and patch 1.29 @@ -92,14 +98,14 @@ 1.30 # Handle cross compilation 1.31 case "$ARCH" in 1.32 arm) 1.33 - echo "Compiling: $ARCH Kernel" 1.34 + echo "Compiling: $Arch Kernel" 1.35 make mrproper 1.36 patch -Np1 < $stuff/arm/linux-arm.patch || exit 1 1.37 cp -f $ConfigFile .config 1.38 - yes '' | make ARCH=$ARCH oldconfig 1.39 - make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- bzImage && 1.40 - make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- modules && 1.41 - make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- \ 1.42 + yes '' | make ARCH=$Arch oldconfig 1.43 + make ARCH=$Arch CROSS_COMPILE=${HOST_SYSTEM}- bzImage && 1.44 + make ARCH=$Arch CROSS_COMPILE=${HOST_SYSTEM}- modules && 1.45 + make ARCH=$Arch CROSS_COMPILE=${HOST_SYSTEM}- \ 1.46 INSTALL_MOD_PATH=$DESTDIR modules_install && 1.47 mkdir -p $DESTDIR/boot && 1.48 cp -a arch/arm/boot/zImage \ 1.49 @@ -127,10 +133,9 @@ 1.50 echo "Making kernel proper..." 1.51 make mrproper 1.52 1.53 - # 1.54 - # Linux Arch i386 - GCC arch i486 1.55 - # 1.56 - echo "Making $ARCH Kernel..." 1.57 + 1.58 + 1.59 + echo "Making $Arch Kernel..." 1.60 1.61 # Build bzImage without modules first 1.62 if [ -z "$nonomods" ]; then 1.63 @@ -143,10 +148,10 @@ 1.64 -e 's/^CONFIG_RT2870/#&/' .config 1.65 1.66 title 'Configure bzImage without modules...' 1.67 - yes '' | make ARCH=$ARCH oldconfig 1.68 + yes '' | make ARCH=$Arch oldconfig 1.69 1.70 title 'Building bzImage without modules...' 1.71 - make ARCH=$ARCH -j4 bzImage || exit 1 1.72 + make ARCH=$Arch -j4 bzImage || exit 1 1.73 1.74 mkdir -p $DESTDIR 1.75 mv arch/x86/boot/bzImage $DESTDIR 1.76 @@ -157,14 +162,14 @@ 1.77 cp -f $ConfigFile .config 1.78 1.79 title 'Configure bzImage with modules...' 1.80 - yes '' | make ARCH=$ARCH oldconfig 1.81 + yes '' | make ARCH=$Arch oldconfig 1.82 1.83 1.84 title 'Building bzImage with modules...' 1.85 - make ARCH=$ARCH -j4 bzImage && 1.86 - make ARCH=$ARCH -j4 modules && 1.87 - make ARCH=$ARCH INSTALL_MOD_PATH=$DESTDIR modules_install && 1.88 - make ARCH=$ARCH INSTALL_HDR_PATH=$DESTDIR/usr headers_install && 1.89 + make ARCH=$Arch -j4 bzImage && 1.90 + make ARCH=$Arch -j4 modules && 1.91 + make ARCH=$Arch INSTALL_MOD_PATH=$DESTDIR modules_install && 1.92 + make ARCH=$Arch INSTALL_HDR_PATH=$DESTDIR/usr headers_install && 1.93 1.94 [ -s arch/x86/boot/bzImage ] || return 1 1.95 mkdir -p $DESTDIR/boot