slitaz-arm rev 62
Move RPi rootfs to rpi/ (used by many flavor), add PTYS_LEGACY support to kernel (we want to open and xterm)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Sat Mar 15 18:09:54 2014 +0100 (2014-03-15) |
| parents | 45169f4d9df0 |
| children | c6d3db386d89 |
| files | flavors/rpi-base/rootfs/boot/cmdline.txt flavors/rpi-base/rootfs/boot/config.txt flavors/rpi-base/rootfs/etc/fstab rpi/linux-rpi.patch rpi/rootfs/boot/cmdline.txt rpi/rootfs/boot/config.txt rpi/rootfs/etc/fstab sat sat-rpi |
line diff
1.1 --- a/flavors/rpi-base/rootfs/boot/cmdline.txt Sat Mar 15 17:25:47 2014 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,1 +0,0 @@ 1.4 -root=/dev/mmcblk0p3 rootwait quiet
2.1 --- a/flavors/rpi-base/rootfs/boot/config.txt Sat Mar 15 17:25:47 2014 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,1 +0,0 @@ 2.4 -kernel=kernel.img
3.1 --- a/flavors/rpi-base/rootfs/etc/fstab Sat Mar 15 17:25:47 2014 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,7 +0,0 @@ 3.4 -# /etc/fstab: Slitaz ARM static filesystems. 3.5 -# 3.6 -proc /proc proc defaults 0 0 3.7 -sysfs /sys sysfs defaults 0 0 3.8 -/dev/mmcblk0p1 /boot auto noauto,noatime 1 2 3.9 -/dev/mmcblk0p2 none swap sw 0 0 3.10 -/dev/mmcblk0p3 / btrfs noatime 0 1
4.1 --- a/rpi/linux-rpi.patch Sat Mar 15 17:25:47 2014 +0100 4.2 +++ b/rpi/linux-rpi.patch Sat Mar 15 18:09:54 2014 +0100 4.3 @@ -1,5 +1,5 @@ 4.4 --- .config 4.5 -+++ ../linux.config.new 4.6 ++++ .config 4.7 @@ -31,7 +31,7 @@ 4.8 CONFIG_BROKEN_ON_SMP=y 4.9 CONFIG_INIT_ENV_ARG_LIMIT=32 4.10 @@ -29,6 +29,15 @@ 4.11 CONFIG_SCHED_AUTOGROUP=y 4.12 CONFIG_MM_OWNER=y 4.13 # CONFIG_SYSFS_DEPRECATED is not set 4.14 +@@ -137,7 +139,7 @@ 4.15 + # CONFIG_RD_LZMA is not set 4.16 + # CONFIG_RD_XZ is not set 4.17 + # CONFIG_RD_LZO is not set 4.18 +-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 4.19 ++CONFIG_CC_OPTIMIZE_FOR_SIZE=y 4.20 + CONFIG_SYSCTL=y 4.21 + CONFIG_ANON_INODES=y 4.22 + CONFIG_HAVE_UID16=y 4.23 @@ -206,7 +208,6 @@ 4.24 # 4.25 # GCOV-based kernel profiling 4.26 @@ -69,7 +78,17 @@ 4.27 CONFIG_CARL9170=m 4.28 CONFIG_CARL9170_LEDS=y 4.29 CONFIG_CARL9170_WPC=y 4.30 -@@ -1651,12 +1648,10 @@ 4.31 +@@ -1634,7 +1631,8 @@ 4.32 + CONFIG_VT_HW_CONSOLE_BINDING=y 4.33 + CONFIG_UNIX98_PTYS=y 4.34 + # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 4.35 +-# CONFIG_LEGACY_PTYS is not set 4.36 ++CONFIG_LEGACY_PTYS=y 4.37 ++CONFIG_LEGACY_PTY_COUNT=256 4.38 + # CONFIG_SERIAL_NONSTANDARD is not set 4.39 + # CONFIG_N_GSM is not set 4.40 + # CONFIG_TRACE_SINK is not set 4.41 +@@ -1651,12 +1649,10 @@ 4.42 # CONFIG_SERIAL_AMBA_PL010 is not set 4.43 CONFIG_SERIAL_AMBA_PL011=y 4.44 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 4.45 @@ -82,7 +101,7 @@ 4.46 # CONFIG_SERIAL_SCCNXP is not set 4.47 # CONFIG_SERIAL_TIMBERDALE is not set 4.48 # CONFIG_SERIAL_ALTERA_JTAGUART is not set 4.49 -@@ -2226,7 +2221,6 @@ 4.50 +@@ -2226,7 +2222,6 @@ 4.51 CONFIG_DVB_B2C2_FLEXCOP=m 4.52 CONFIG_SMS_SIANO_MDTV=m 4.53 CONFIG_SMS_SIANO_RC=y 4.54 @@ -90,7 +109,7 @@ 4.55 4.56 # 4.57 # Media ancillary drivers (tuners, sensors, i2c, frontends) 4.58 -@@ -2837,7 +2831,7 @@ 4.59 +@@ -2837,7 +2832,7 @@ 4.60 CONFIG_USB_ISIGHTFW=m 4.61 CONFIG_USB_YUREX=m 4.62 CONFIG_USB_EZUSB_FX2=m 4.63 @@ -99,7 +118,7 @@ 4.64 # CONFIG_USB_PHY is not set 4.65 # CONFIG_USB_GADGET is not set 4.66 CONFIG_MMC=y 4.67 -@@ -3129,34 +3123,18 @@ 4.68 +@@ -3129,34 +3124,18 @@ 4.69 CONFIG_EXT4_FS_SECURITY=y 4.70 # CONFIG_EXT4_DEBUG is not set 4.71 CONFIG_JBD2=y 4.72 @@ -138,7 +157,7 @@ 4.73 CONFIG_BTRFS_FS_POSIX_ACL=y 4.74 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set 4.75 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set 4.76 -@@ -3171,10 +3149,10 @@ 4.77 +@@ -3171,10 +3150,10 @@ 4.78 CONFIG_FANOTIFY=y 4.79 CONFIG_QUOTA=y 4.80 # CONFIG_QUOTA_NETLINK_INTERFACE is not set 4.81 @@ -151,7 +170,7 @@ 4.82 CONFIG_QFMT_V2=m 4.83 CONFIG_QUOTACTL=y 4.84 CONFIG_AUTOFS4_FS=y 4.85 -@@ -3258,7 +3236,6 @@ 4.86 +@@ -3258,7 +3237,6 @@ 4.87 # CONFIG_SYSV_FS is not set 4.88 # CONFIG_UFS_FS is not set 4.89 CONFIG_F2FS_FS=y 4.90 @@ -159,7 +178,7 @@ 4.91 CONFIG_F2FS_FS_XATTR=y 4.92 CONFIG_F2FS_FS_POSIX_ACL=y 4.93 CONFIG_NETWORK_FILESYSTEMS=y 4.94 -@@ -3308,39 +3285,39 @@ 4.95 +@@ -3308,39 +3286,39 @@ 4.96 CONFIG_NLS=y 4.97 CONFIG_NLS_DEFAULT="utf8" 4.98 CONFIG_NLS_CODEPAGE_437=y 4.99 @@ -230,7 +249,7 @@ 4.100 CONFIG_NLS_ISO8859_15=m 4.101 CONFIG_NLS_KOI8_R=m 4.102 CONFIG_NLS_KOI8_U=m 4.103 -@@ -3362,7 +3339,7 @@ 4.104 +@@ -3362,7 +3340,7 @@ 4.105 # 4.106 # Kernel hacking 4.107 # 4.108 @@ -239,7 +258,7 @@ 4.109 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 4.110 CONFIG_ENABLE_WARN_DEPRECATED=y 4.111 CONFIG_ENABLE_MUST_CHECK=y 4.112 -@@ -3371,7 +3348,7 @@ 4.113 +@@ -3371,7 +3349,7 @@ 4.114 # CONFIG_STRIP_ASM_SYMS is not set 4.115 # CONFIG_READABLE_ASM is not set 4.116 # CONFIG_UNUSED_SYMBOLS is not set 4.117 @@ -248,7 +267,7 @@ 4.118 # CONFIG_HEADERS_CHECK is not set 4.119 # CONFIG_DEBUG_SECTION_MISMATCH is not set 4.120 CONFIG_DEBUG_KERNEL=y 4.121 -@@ -3379,13 +3356,10 @@ 4.122 +@@ -3379,13 +3357,10 @@ 4.123 # CONFIG_LOCKUP_DETECTOR is not set 4.124 # CONFIG_PANIC_ON_OOPS is not set 4.125 CONFIG_PANIC_ON_OOPS_VALUE=0 4.126 @@ -266,7 +285,7 @@ 4.127 # CONFIG_DEBUG_OBJECTS is not set 4.128 # CONFIG_SLUB_DEBUG_ON is not set 4.129 # CONFIG_SLUB_STATS is not set 4.130 -@@ -3401,20 +3375,19 @@ 4.131 +@@ -3401,20 +3376,19 @@ 4.132 # CONFIG_LOCK_STAT is not set 4.133 # CONFIG_DEBUG_ATOMIC_SLEEP is not set 4.134 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 4.135 @@ -290,7 +309,7 @@ 4.136 4.137 # 4.138 # RCU Debugging 4.139 -@@ -3430,10 +3403,9 @@ 4.140 +@@ -3430,10 +3404,9 @@ 4.141 # CONFIG_BACKTRACE_SELF_TEST is not set 4.142 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 4.143 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 4.144 @@ -302,7 +321,7 @@ 4.145 # CONFIG_DEBUG_PAGEALLOC is not set 4.146 CONFIG_HAVE_FUNCTION_TRACER=y 4.147 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 4.148 -@@ -3445,37 +3417,15 @@ 4.149 +@@ -3445,37 +3418,15 @@ 4.150 CONFIG_RING_BUFFER=y 4.151 CONFIG_RING_BUFFER_ALLOW_SWAP=y 4.152 CONFIG_TRACING_SUPPORT=y 4.153 @@ -342,7 +361,7 @@ 4.154 # CONFIG_TEST_STRING_HELPERS is not set 4.155 # CONFIG_TEST_KSTRTOX is not set 4.156 CONFIG_STRICT_DEVMEM=y 4.157 -@@ -3499,7 +3449,7 @@ 4.158 +@@ -3499,7 +3450,7 @@ 4.159 # CONFIG_SECURITYFS is not set 4.160 CONFIG_DEFAULT_SECURITY_DAC=y 4.161 CONFIG_DEFAULT_SECURITY="" 4.162 @@ -351,7 +370,7 @@ 4.163 CONFIG_ASYNC_CORE=m 4.164 CONFIG_ASYNC_MEMCPY=m 4.165 CONFIG_ASYNC_XOR=m 4.166 -@@ -3619,7 +3569,7 @@ 4.167 +@@ -3619,7 +3570,7 @@ 4.168 # 4.169 # Library routines 4.170 # 4.171 @@ -360,7 +379,7 @@ 4.172 CONFIG_BITREVERSE=y 4.173 CONFIG_GENERIC_STRNCPY_FROM_USER=y 4.174 CONFIG_GENERIC_STRNLEN_USER=y 4.175 -@@ -3640,7 +3590,7 @@ 4.176 +@@ -3640,7 +3591,7 @@ 4.177 # CONFIG_CRC8 is not set 4.178 CONFIG_AUDIT_GENERIC=y 4.179 CONFIG_ZLIB_INFLATE=y
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/rpi/rootfs/boot/cmdline.txt Sat Mar 15 18:09:54 2014 +0100 5.3 @@ -0,0 +1,1 @@ 5.4 +root=/dev/mmcblk0p3 rootwait quiet
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/rpi/rootfs/boot/config.txt Sat Mar 15 18:09:54 2014 +0100 6.3 @@ -0,0 +1,1 @@ 6.4 +kernel=kernel.img
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/rpi/rootfs/etc/fstab Sat Mar 15 18:09:54 2014 +0100 7.3 @@ -0,0 +1,7 @@ 7.4 +# /etc/fstab: Slitaz ARM static filesystems. 7.5 +# 7.6 +proc /proc proc defaults 0 0 7.7 +sysfs /sys sysfs defaults 0 0 7.8 +/dev/mmcblk0p1 /boot auto noauto,noatime 1 2 7.9 +/dev/mmcblk0p2 none swap sw 0 0 7.10 +/dev/mmcblk0p3 / btrfs noatime 0 1
8.1 --- a/sat Sat Mar 15 17:25:47 2014 +0100 8.2 +++ b/sat Sat Mar 15 18:09:54 2014 +0100 8.3 @@ -162,10 +162,10 @@ 8.4 # Mirror 8.5 echo "$mirror" > ${rootfs}/var/lib/tazpkg/mirror 8.6 8.7 - # /init & /run 8.8 + # /init & /var/run 8.9 cd ${rootfs} 8.10 - rm init && ln -s /bin/busybox init 8.11 - mkdir -p run 8.12 + rm init var/run && ln -s /bin/busybox init 8.13 + mkdir -p run var/run 8.14 8.15 # Update modules.dep 8.16 if [ -f "var/lib/tazpkg/installed/linux/receipt" ]; then
9.1 --- a/sat-rpi Sat Mar 15 17:25:47 2014 +0100 9.2 +++ b/sat-rpi Sat Mar 15 18:09:54 2014 +0100 9.3 @@ -222,6 +222,18 @@ 9.4 boldify "SliTaz Raspberry Pi distro" 9.5 separator 9.6 9.7 + # Custom RPi rootfs: make sure all files belong to root 9.8 + if [ -d "$rpi/rootfs" ]; then 9.9 + size=$(du -sh $rpi/rootfs | awk '{print $1}') 9.10 + echo -n "Copying custom RPi rootfs: $size" 9.11 + tmp=$distro/tmp-$$ 9.12 + mkdir -p $tmp 9.13 + cp -r $rpi/rootfs/* $tmp 9.14 + chown -R root.root $tmp 9.15 + cp -a $tmp/* ${rootfs} && rm -rf $tmp 9.16 + status 9.17 + fi 9.18 + 9.19 # Boot firmware 9.20 echo -n "Copying: firmware files..." 9.21 mkdir -p ${boot} && get_fw 9.22 @@ -314,7 +326,7 @@ 9.23 make mrproper && 9.24 make ARCH=arm bcmrpi_defconfig 9.25 echo "Patching SliTaz RPi Linux .config" 9.26 - patch -p0 -i ${rpi}/linux-rpi.patch || exit 1 9.27 + patch -p0 -i ${rpi}/linux-rpi.patch || exit 1 9.28 make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage && 9.29 make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules && 9.30 make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \