Author: richard
Date: Fri Apr 3 05:50:46 2009
New Revision: 5107
URL: http://svn.slimdevices.com/jive?rev=5107&view=rev
Log:
Bug: 11334
Description:
Replace mini_fo with unionfs.
Modified:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/files/defconfig-jive
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
Modified:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
URL:
http://svn.slimdevices.com/jive/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
Fri Apr 3 05:50:46 2009
@@ -63,10 +63,25 @@
# Mount overlay filesystem
-/bin/mount -t mini_fo -o base=/,sto=/mnt/storage / /mnt/overlay
+grep -q unionfs /proc/filesystems
+HAS_UNIONFS=$?
-# Mount devfs filesystem in overlay
-/bin/mount -o move /dev /mnt/overlay/dev
+if [ $HAS_UNIONFS -eq 0 ]
+then
+ /bin/echo "Filesystem overlay: unionfs"
+
+ /bin/mount -t unionfs -o dirs=/mnt/storage=rw:/=ro none /mnt/overlay
+ /bin/mount -o move /dev /mnt/overlay/dev
+
+ /bin/umount /proc
+ /bin/mount -t proc none /mnt/overlay/proc/
+else
+ /bin/echo "Filesystem overlay: mini_fo"
+
+ /bin/mount -t mini_fo -o base=/,sto=/mnt/storage / /mnt/overlay
+ /bin/mount -o move /dev /mnt/overlay/dev
+fi
+
# Run init process
exec /usr/sbin/chroot /mnt/overlay /sbin/init
Modified:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
---
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Fri Apr 3 05:50:46 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r16"
+PR = "r17"
SRC_URI = " \
file://config \
Modified:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/files/defconfig-jive
URL:
http://svn.slimdevices.com/jive/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/files/defconfig-jive?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/files/defconfig-jive
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/files/defconfig-jive
Fri Apr 3 05:50:46 2009
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22
-# Fri Jan 2 14:20:11 2009
+# Fri Apr 3 10:29:50 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -54,7 +54,7 @@
# CONFIG_BLK_DEV_INITRD is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
@@ -581,10 +581,7 @@
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
@@ -616,6 +613,7 @@
#
CONFIG_SERIO=y
CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
@@ -994,7 +992,8 @@
CONFIG_MINI_FO=y
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
-# CONFIG_INOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
@@ -1027,6 +1026,13 @@
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_CONFIGFS_FS is not set
+
+#
+# Layered filesystems
+#
+CONFIG_UNION_FS=y
+# CONFIG_UNION_FS_XATTR is not set
+# CONFIG_UNION_FS_DEBUG is not set
#
# Miscellaneous filesystems
@@ -1152,7 +1158,7 @@
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
Modified:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
URL:
http://svn.slimdevices.com/jive/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
Fri Apr 3 05:50:46 2009
@@ -4,7 +4,7 @@
LINUX_VERSION = "2.6.22"
PV = "${LINUX_VERSION}+${DISTRO_VERSION}+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
inherit kernel
@@ -16,6 +16,14 @@
S = "${WORKDIR}/linux-${LINUX_VERSION}"
COMPATIBLE_MACHINE = "(jive)"
+
+
+# new kernel patches are managed by quilt, and checked into svn.
+do_patch() {
+ cd ${S}
+ quilt push -a
+}
+
do_configure_prepend() {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
