wok-next rev 20442
linux-dev: fix defconfig for 32bit; refuse linux-uml on 32bit too because of compiling errors
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Feb 24 10:43:01 2018 +0200 (2018-02-24) |
parents | 60e87d3e45c7 |
children | 0e7893ac206d |
files | linux-dev/receipt |
line diff
1.1 --- a/linux-dev/receipt Sat Feb 24 05:41:11 2018 +0200 1.2 +++ b/linux-dev/receipt Sat Feb 24 10:43:01 2018 +0200 1.3 @@ -13,17 +13,8 @@ 1.4 TARBALL="linux-$KBASEVER.tar.xz" 1.5 WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL" 1.6 1.7 -case $ARCH in 1.8 - i*86) 1.9 - SPLIT="linux-dev linux-api-headers linux-uml" 1.10 - BUILD_DEPENDS="python-sphinx perl xmlto util-linux-getopt docbook-xsl \ 1.11 - coreutils-operations findutils ncurses-dev patch bash bc" 1.12 - ;; 1.13 - x86_64) 1.14 - SPLIT="linux-dev linux-api-headers" 1.15 - BUILD_DEPENDS="perl patch ncurses-dev" 1.16 - ;; 1.17 -esac 1.18 +BUILD_DEPENDS="perl patch ncurses-dev" 1.19 +SPLIT="linux-dev linux-api-headers" # linux-uml 1.20 SIBLINGS="linux" 1.21 COOKOPTS="!pngz !svgz !uiz !strip" 1.22 1.23 @@ -43,6 +34,11 @@ 1.24 fi 1.25 fi 1.26 1.27 + case $ARCH in 1.28 + i?86) Arch='i386';; # i486 for system -> i386 for kernel 1.29 + *) Arch="$ARCH";; 1.30 + esac 1.31 + 1.32 make mrproper && 1.33 make headers_check && 1.34 make INSTALL_HDR_PATH=$DESTDIR/usr headers_install 1.35 @@ -52,10 +48,10 @@ 1.36 # Get and apply Aufs patches 1.37 . $WOK/linux/stuff/tools/aufs-patches 1.38 1.39 - make defconfig 1.40 + make ARCH=$Arch defconfig 1.41 sed -i 's/^menuconfig:.*/z&\n\t@echo menuconfig is ready\n\n&/' \ 1.42 scripts/kconfig/Makefile 1.43 - make zmenuconfig 1.44 + make ARCH=$Arch zmenuconfig 1.45 1.46 p="$install/usr/src/linux-$VERSION-slitaz" 1.47 mkdir -p $p 1.48 @@ -64,17 +60,13 @@ 1.49 mkdir -p $install/usr/bin 1.50 mv $p/scripts/kconfig/mconf $install/usr/bin 1.51 1.52 - case $ARCH in 1.53 - i?86) Arch='i386';; # i486 for system -> i386 for kernel 1.54 - *) Arch="$ARCH";; 1.55 - esac 1.56 sed "s|@VERSION@|$VERSION|; s|@ARCH@|$Arch|" $stuff/menuconfig.in \ 1.57 > $install/usr/bin/menuconfig 1.58 chmod a+x $install/usr/bin/menuconfig 1.59 1.60 1.61 case "$ARCH" in 1.62 - i?86) 1.63 + i?86-refuse-too) 1.64 sed -i 's|uname -m|echo i386|; s|/bin/bash|/bin/ash|g' Makefile 1.65 make ARCH=um mrproper 1.66 cp $stuff/mini.config .