wok-next diff linux-dev/receipt @ rev 20441
linux, linux-dev: fix mess with i386|i486, update 32bit config
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Feb 24 05:41:11 2018 +0200 (2018-02-24) |
parents | 90a5eb560fd6 |
children | 5fe9c8951ce4 |
line diff
1.1 --- a/linux-dev/receipt Wed Feb 21 19:48:17 2018 +0200 1.2 +++ b/linux-dev/receipt Sat Feb 24 05:41:11 2018 +0200 1.3 @@ -63,23 +63,30 @@ 1.4 1.5 mkdir -p $install/usr/bin 1.6 mv $p/scripts/kconfig/mconf $install/usr/bin 1.7 - sed "s|@VERSION@|$VERSION|; s|@ARCH@|$ARCH|" $stuff/menuconfig.in \ 1.8 + 1.9 + case $ARCH in 1.10 + i?86) Arch='i386';; # i486 for system -> i386 for kernel 1.11 + *) Arch="$ARCH";; 1.12 + esac 1.13 + sed "s|@VERSION@|$VERSION|; s|@ARCH@|$Arch|" $stuff/menuconfig.in \ 1.14 > $install/usr/bin/menuconfig 1.15 chmod a+x $install/usr/bin/menuconfig 1.16 1.17 1.18 - if [ "$ARCH" == 'i386' ]; then 1.19 - sed -i 's|uname -m|echo i386|; s|/bin/bash|/bin/ash|g' Makefile 1.20 - make ARCH=um mrproper 1.21 - cp $stuff/mini.config . 1.22 - make ARCH=um allnoconfig KCONFIG_ALLCONFIG=mini.config && 1.23 - make ARCH=um || return 1 1.24 + case "$ARCH" in 1.25 + i?86) 1.26 + sed -i 's|uname -m|echo i386|; s|/bin/bash|/bin/ash|g' Makefile 1.27 + make ARCH=um mrproper 1.28 + cp $stuff/mini.config . 1.29 + make ARCH=um allnoconfig KCONFIG_ALLCONFIG=mini.config && 1.30 + make ARCH=um || return 1 1.31 1.32 - mkdir -p $install/boot 1.33 - cp $src/linux $install/boot/linux-uml-$VERSION 1.34 - sed "s|@VERSION@|$VERSION|" $stuff/vm-uml.in > $install/boot/vm-uml 1.35 - chmod 755 $install/boot/vm-uml 1.36 - fi 1.37 + mkdir -p $install/boot 1.38 + cp $src/linux $install/boot/linux-uml-$VERSION 1.39 + sed "s|@VERSION@|$VERSION|" $stuff/vm-uml.in > $install/boot/vm-uml 1.40 + chmod 755 $install/boot/vm-uml 1.41 + ;; 1.42 + esac 1.43 } 1.44 1.45