wok-tiny rev 164
linux: update FB_SIS config
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Jul 28 06:28:54 2020 +0000 (2020-07-28) |
parents | 86fb26b8cd18 |
children | 6a0aae17c69a |
files | linux/receipt linux/stuff/linux-2.6.14-slitaz.config |
line diff
1.1 --- a/linux/receipt Thu Jun 25 11:05:15 2020 +0000 1.2 +++ b/linux/receipt Tue Jul 28 06:28:54 2020 +0000 1.3 @@ -38,13 +38,13 @@ 1.4 bzcat $SRC/$(basename $PATCH) | patch -p1 1.5 patch -p0 < $stuff/linux-2.6.14-unpack.u 1.6 patch -p0 < $stuff/jsclipboard.u 1.7 - sed -i 's|\([>\.]\)val|\1u.val|;s|\([>\.]\)next|\1u.next|;216s|};|} u;|' \ 1.8 + sed -i 's|\([>\.]\)val|\1u.val|;s|\([>\.]\)next|\1u.next|;s|\t};|\t} u;|' \ 1.9 lib/inflate.c 1.10 sed '/DEBUG/,/* kstrdup/d' < mm/slab.c > mm/kstrdup.c 1.11 echo 'obj-y += kstrdup.o' >> mm/Makefile 1.12 sed -i 's|3.1024|11*256|' arch/i386/boot/compressed/misc.c 1.13 sed -i 's/O_CREAT/&|O_TRUNC/' init/initramfs.c 1.14 - false && which advdef 2> /dev/null && 1.15 + which advdef 2> /dev/null && ! which upx 2> /dev/null && 1.16 sed -i 's|gzip)|&\n advdef -z4 $@|' \ 1.17 usr/Makefile arch/i386/boot/compressed/Makefile 1.18 false && which zopfli 2> /dev/null && 1.19 @@ -64,8 +64,6 @@ 1.20 cp $stuff/linux-$VERSION-slitaz.config .config 1.21 yes '' | make ARCH=i386 HOSTCC=gcc-2 config 1.22 make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage 1.23 - which upx 2> /dev/null && 1.24 - upx --ultra-brute arch/i386/boot/bzImage 1.25 1.26 grep -q "CONFIG_MODULES=y" .config && 1.27 make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 modules && 1.28 @@ -74,6 +72,10 @@ 1.29 cp $stuff/bundle . 1.30 sh ./bundle 1.31 S2bin cmdline 1.32 + 1.33 + which upx 2> /dev/null && 1.34 + cp arch/i386/boot/bzImage arch/i386/boot/bzImage.noupx && 1.35 + upx --ultra-brute arch/i386/boot/bzImage 1.36 } 1.37 1.38 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- a/linux/stuff/linux-2.6.14-slitaz.config Thu Jun 25 11:05:15 2020 +0000 2.2 +++ b/linux/stuff/linux-2.6.14-slitaz.config Tue Jul 28 06:28:54 2020 +0000 2.3 @@ -66,7 +66,8 @@ 2.4 CONFIG_CC_ALIGN_LABELS=0 2.5 CONFIG_CC_ALIGN_LOOPS=0 2.6 CONFIG_CC_ALIGN_JUMPS=0 2.7 -# CONFIG_TINY_CFLAGS is not set 2.8 +CONFIG_TINY_CFLAGS=y 2.9 +CONFIG_TINY_CFLAGS_VAL="-march=i386" 2.10 # CONFIG_CRC32_TABLES is not set 2.11 # CONFIG_INLINE_THREADINFO is not set 2.12 # CONFIG_SLAB is not set 2.13 @@ -958,8 +959,8 @@ 2.14 # CONFIG_FB_SAVAGE_I2C is not set 2.15 # CONFIG_FB_SAVAGE_ACCEL is not set 2.16 CONFIG_FB_SIS=m 2.17 -# CONFIG_FB_SIS_300 is not set 2.18 -# CONFIG_FB_SIS_315 is not set 2.19 +CONFIG_FB_SIS_300=y 2.20 +CONFIG_FB_SIS_315=y 2.21 CONFIG_FB_NEOMAGIC=m 2.22 CONFIG_FB_KYRO=m 2.23 CONFIG_FB_3DFX=m