# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394903394 -3600
# Node ID f74a9206fdd03540e20fc4b07e5731c887471b4a
# Parent  45169f4d9df04017ef468965502df422b731d6b8
Move RPi rootfs to rpi/ (used by many flavor), add PTYS_LEGACY support to kernel (we want to open and xterm)

diff -r 45169f4d9df0 -r f74a9206fdd0 flavors/rpi-base/rootfs/boot/cmdline.txt
--- a/flavors/rpi-base/rootfs/boot/cmdline.txt	Sat Mar 15 17:25:47 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-root=/dev/mmcblk0p3 rootwait quiet
diff -r 45169f4d9df0 -r f74a9206fdd0 flavors/rpi-base/rootfs/boot/config.txt
--- a/flavors/rpi-base/rootfs/boot/config.txt	Sat Mar 15 17:25:47 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-kernel=kernel.img
diff -r 45169f4d9df0 -r f74a9206fdd0 flavors/rpi-base/rootfs/etc/fstab
--- a/flavors/rpi-base/rootfs/etc/fstab	Sat Mar 15 17:25:47 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# /etc/fstab: Slitaz ARM static filesystems.
-#
-proc              /proc       proc     defaults           0 0
-sysfs             /sys        sysfs    defaults           0 0
-/dev/mmcblk0p1    /boot       auto     noauto,noatime     1 2
-/dev/mmcblk0p2    none        swap     sw                 0 0
-/dev/mmcblk0p3    /           btrfs    noatime            0 1
diff -r 45169f4d9df0 -r f74a9206fdd0 rpi/linux-rpi.patch
--- a/rpi/linux-rpi.patch	Sat Mar 15 17:25:47 2014 +0100
+++ b/rpi/linux-rpi.patch	Sat Mar 15 18:09:54 2014 +0100
@@ -1,5 +1,5 @@
 --- .config
-+++ ../linux.config.new
++++ .config
 @@ -31,7 +31,7 @@
  CONFIG_BROKEN_ON_SMP=y
  CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -29,6 +29,15 @@
  CONFIG_SCHED_AUTOGROUP=y
  CONFIG_MM_OWNER=y
  # CONFIG_SYSFS_DEPRECATED is not set
+@@ -137,7 +139,7 @@
+ # CONFIG_RD_LZMA is not set
+ # CONFIG_RD_XZ is not set
+ # CONFIG_RD_LZO is not set
+-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
++CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+ CONFIG_SYSCTL=y
+ CONFIG_ANON_INODES=y
+ CONFIG_HAVE_UID16=y
 @@ -206,7 +208,6 @@
  #
  # GCOV-based kernel profiling
@@ -69,7 +78,17 @@
  CONFIG_CARL9170=m
  CONFIG_CARL9170_LEDS=y
  CONFIG_CARL9170_WPC=y
-@@ -1651,12 +1648,10 @@
+@@ -1634,7 +1631,8 @@
+ CONFIG_VT_HW_CONSOLE_BINDING=y
+ CONFIG_UNIX98_PTYS=y
+ # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+-# CONFIG_LEGACY_PTYS is not set
++CONFIG_LEGACY_PTYS=y
++CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_SERIAL_NONSTANDARD is not set
+ # CONFIG_N_GSM is not set
+ # CONFIG_TRACE_SINK is not set
+@@ -1651,12 +1649,10 @@
  # CONFIG_SERIAL_AMBA_PL010 is not set
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -82,7 +101,7 @@
  # CONFIG_SERIAL_SCCNXP is not set
  # CONFIG_SERIAL_TIMBERDALE is not set
  # CONFIG_SERIAL_ALTERA_JTAGUART is not set
-@@ -2226,7 +2221,6 @@
+@@ -2226,7 +2222,6 @@
  CONFIG_DVB_B2C2_FLEXCOP=m
  CONFIG_SMS_SIANO_MDTV=m
  CONFIG_SMS_SIANO_RC=y
@@ -90,7 +109,7 @@
  
  #
  # Media ancillary drivers (tuners, sensors, i2c, frontends)
-@@ -2837,7 +2831,7 @@
+@@ -2837,7 +2832,7 @@
  CONFIG_USB_ISIGHTFW=m
  CONFIG_USB_YUREX=m
  CONFIG_USB_EZUSB_FX2=m
@@ -99,7 +118,7 @@
  # CONFIG_USB_PHY is not set
  # CONFIG_USB_GADGET is not set
  CONFIG_MMC=y
-@@ -3129,34 +3123,18 @@
+@@ -3129,34 +3124,18 @@
  CONFIG_EXT4_FS_SECURITY=y
  # CONFIG_EXT4_DEBUG is not set
  CONFIG_JBD2=y
@@ -138,7 +157,7 @@
  CONFIG_BTRFS_FS_POSIX_ACL=y
  # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
  # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-@@ -3171,10 +3149,10 @@
+@@ -3171,10 +3150,10 @@
  CONFIG_FANOTIFY=y
  CONFIG_QUOTA=y
  # CONFIG_QUOTA_NETLINK_INTERFACE is not set
@@ -151,7 +170,7 @@
  CONFIG_QFMT_V2=m
  CONFIG_QUOTACTL=y
  CONFIG_AUTOFS4_FS=y
-@@ -3258,7 +3236,6 @@
+@@ -3258,7 +3237,6 @@
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_F2FS_FS=y
@@ -159,7 +178,7 @@
  CONFIG_F2FS_FS_XATTR=y
  CONFIG_F2FS_FS_POSIX_ACL=y
  CONFIG_NETWORK_FILESYSTEMS=y
-@@ -3308,39 +3285,39 @@
+@@ -3308,39 +3286,39 @@
  CONFIG_NLS=y
  CONFIG_NLS_DEFAULT="utf8"
  CONFIG_NLS_CODEPAGE_437=y
@@ -230,7 +249,7 @@
  CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
-@@ -3362,7 +3339,7 @@
+@@ -3362,7 +3340,7 @@
  #
  # Kernel hacking
  #
@@ -239,7 +258,7 @@
  CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
-@@ -3371,7 +3348,7 @@
+@@ -3371,7 +3349,7 @@
  # CONFIG_STRIP_ASM_SYMS is not set
  # CONFIG_READABLE_ASM is not set
  # CONFIG_UNUSED_SYMBOLS is not set
@@ -248,7 +267,7 @@
  # CONFIG_HEADERS_CHECK is not set
  # CONFIG_DEBUG_SECTION_MISMATCH is not set
  CONFIG_DEBUG_KERNEL=y
-@@ -3379,13 +3356,10 @@
+@@ -3379,13 +3357,10 @@
  # CONFIG_LOCKUP_DETECTOR is not set
  # CONFIG_PANIC_ON_OOPS is not set
  CONFIG_PANIC_ON_OOPS_VALUE=0
@@ -266,7 +285,7 @@
  # CONFIG_DEBUG_OBJECTS is not set
  # CONFIG_SLUB_DEBUG_ON is not set
  # CONFIG_SLUB_STATS is not set
-@@ -3401,20 +3375,19 @@
+@@ -3401,20 +3376,19 @@
  # CONFIG_LOCK_STAT is not set
  # CONFIG_DEBUG_ATOMIC_SLEEP is not set
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
@@ -290,7 +309,7 @@
  
  #
  # RCU Debugging
-@@ -3430,10 +3403,9 @@
+@@ -3430,10 +3404,9 @@
  # CONFIG_BACKTRACE_SELF_TEST is not set
  # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
  # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -302,7 +321,7 @@
  # CONFIG_DEBUG_PAGEALLOC is not set
  CONFIG_HAVE_FUNCTION_TRACER=y
  CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-@@ -3445,37 +3417,15 @@
+@@ -3445,37 +3418,15 @@
  CONFIG_RING_BUFFER=y
  CONFIG_RING_BUFFER_ALLOW_SWAP=y
  CONFIG_TRACING_SUPPORT=y
@@ -342,7 +361,7 @@
  # CONFIG_TEST_STRING_HELPERS is not set
  # CONFIG_TEST_KSTRTOX is not set
  CONFIG_STRICT_DEVMEM=y
-@@ -3499,7 +3449,7 @@
+@@ -3499,7 +3450,7 @@
  # CONFIG_SECURITYFS is not set
  CONFIG_DEFAULT_SECURITY_DAC=y
  CONFIG_DEFAULT_SECURITY=""
@@ -351,7 +370,7 @@
  CONFIG_ASYNC_CORE=m
  CONFIG_ASYNC_MEMCPY=m
  CONFIG_ASYNC_XOR=m
-@@ -3619,7 +3569,7 @@
+@@ -3619,7 +3570,7 @@
  #
  # Library routines
  #
@@ -360,7 +379,7 @@
  CONFIG_BITREVERSE=y
  CONFIG_GENERIC_STRNCPY_FROM_USER=y
  CONFIG_GENERIC_STRNLEN_USER=y
-@@ -3640,7 +3590,7 @@
+@@ -3640,7 +3591,7 @@
  # CONFIG_CRC8 is not set
  CONFIG_AUDIT_GENERIC=y
  CONFIG_ZLIB_INFLATE=y
diff -r 45169f4d9df0 -r f74a9206fdd0 rpi/rootfs/boot/cmdline.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/rootfs/boot/cmdline.txt	Sat Mar 15 18:09:54 2014 +0100
@@ -0,0 +1,1 @@
+root=/dev/mmcblk0p3 rootwait quiet
diff -r 45169f4d9df0 -r f74a9206fdd0 rpi/rootfs/boot/config.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/rootfs/boot/config.txt	Sat Mar 15 18:09:54 2014 +0100
@@ -0,0 +1,1 @@
+kernel=kernel.img
diff -r 45169f4d9df0 -r f74a9206fdd0 rpi/rootfs/etc/fstab
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/rootfs/etc/fstab	Sat Mar 15 18:09:54 2014 +0100
@@ -0,0 +1,7 @@
+# /etc/fstab: Slitaz ARM static filesystems.
+#
+proc              /proc       proc     defaults           0 0
+sysfs             /sys        sysfs    defaults           0 0
+/dev/mmcblk0p1    /boot       auto     noauto,noatime     1 2
+/dev/mmcblk0p2    none        swap     sw                 0 0
+/dev/mmcblk0p3    /           btrfs    noatime            0 1
diff -r 45169f4d9df0 -r f74a9206fdd0 sat
--- a/sat	Sat Mar 15 17:25:47 2014 +0100
+++ b/sat	Sat Mar 15 18:09:54 2014 +0100
@@ -162,10 +162,10 @@
 		# Mirror
 		echo "$mirror" > ${rootfs}/var/lib/tazpkg/mirror
 
-		# /init & /run
+		# /init & /var/run
 		cd ${rootfs}
-		rm init && ln -s /bin/busybox init
-		mkdir -p run
+		rm init var/run && ln -s /bin/busybox init
+		mkdir -p run var/run
 
 		# Update modules.dep
 		if [ -f "var/lib/tazpkg/installed/linux/receipt" ]; then
diff -r 45169f4d9df0 -r f74a9206fdd0 sat-rpi
--- a/sat-rpi	Sat Mar 15 17:25:47 2014 +0100
+++ b/sat-rpi	Sat Mar 15 18:09:54 2014 +0100
@@ -222,6 +222,18 @@
 		boldify "SliTaz Raspberry Pi distro"
 		separator
 		
+		# Custom RPi rootfs: make sure all files belong to root
+		if [ -d "$rpi/rootfs" ]; then
+			size=$(du -sh $rpi/rootfs | awk '{print $1}')
+			echo -n "Copying custom RPi rootfs: $size"
+			tmp=$distro/tmp-$$
+			mkdir -p $tmp
+			cp -r $rpi/rootfs/* $tmp
+			chown -R root.root $tmp
+			cp -a $tmp/* ${rootfs} && rm -rf $tmp
+			status
+		fi
+		
 		# Boot firmware
 		echo -n "Copying: firmware files..."
 		mkdir -p ${boot} && get_fw
@@ -314,7 +326,7 @@
 			make mrproper &&
 			make ARCH=arm bcmrpi_defconfig
 			echo "Patching SliTaz RPi Linux .config"
-			patch -p0 -i ${rpi}/linux-rpi.patch || exit 1 
+			patch -p0 -i ${rpi}/linux-rpi.patch || exit 1
 			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage &&
 			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules &&
 			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \