Author: sparky Date: Sun May 1 15:26:24 2011 GMT Module: packages Tag: HEAD ---- Log message: - moved some options around to suite vanilla bcond
---- Files affected: packages/kernel: kernel-multiarch.config (1.67 -> 1.68) , kernel-patches.config (1.9 -> 1.10) ---- Diffs: ================================================================ Index: packages/kernel/kernel-multiarch.config diff -u packages/kernel/kernel-multiarch.config:1.67 packages/kernel/kernel-multiarch.config:1.68 --- packages/kernel/kernel-multiarch.config:1.67 Sat Apr 23 10:30:05 2011 +++ packages/kernel/kernel-multiarch.config Sun May 1 17:26:18 2011 @@ -5181,7 +5181,6 @@ #- file drivers/char/agp/Kconfig goes here #- file drivers/gpu/vga/Kconfig goes here #- file drivers/gpu/drm/Kconfig goes here -#- file drivers/gpu/misc/Kconfig goes here #- file drivers/gpu/stub/Kconfig goes here VGASTATE all=m VIDEO_OUTPUT_CONTROL all=m @@ -5522,7 +5521,6 @@ #- file fs/adfs/Kconfig goes here #- file fs/affs/Kconfig goes here #- file fs/ecryptfs/Kconfig goes here -#- file fs/unionfs/Kconfig goes here #- file fs/hfs/Kconfig goes here #- file fs/hfsplus/Kconfig goes here #- file fs/befs/Kconfig goes here @@ -5542,7 +5540,6 @@ #- file fs/sysv/Kconfig goes here #- file fs/ufs/Kconfig goes here #- file fs/exofs/Kconfig goes here -#- file fs/aufs/Kconfig goes here NETWORK_FILESYSTEMS all=y #- file fs/nfs/Kconfig goes here #- file fs/nfsd/Kconfig goes here @@ -6003,9 +6000,11 @@ #- #- *** FILE: fs/squashfs/Kconfig *** #- +SQUASHFS all=m SQUASHFS_XATTR all=y SQUASHFS_LZO all=y SQUASHFS_XZ all=y +SQUASHFS_EMBEDDED all=n #- #- *** FILE: fs/sysfs/Kconfig *** @@ -6196,9 +6195,6 @@ SUSPEND_FREEZER ppc=y ppc64=y HIBERNATION all=y PM_STD_PARTITION all="" -#- Image Storage (you need at least one allocator) -#- General Options -#- No compression support available without Cryptoapi support. APM_EMULATION ppc=m PM_RUNTIME all=y @@ -6333,10 +6329,10 @@ DMA_API_DEBUG all=n ATOMIC64_SELFTEST all=n ASYNC_RAID6_TEST all=m -TEST_KSTRTOX all=m #- file samples/Kconfig goes here #- file lib/Kconfig.kgdb goes here #- file lib/Kconfig.kmemcheck goes here +TEST_KSTRTOX all=m #- #- *** FILE: lib/Kconfig.kgdb *** @@ -7023,7 +7019,6 @@ #- SECURITY_APPARMOR=y SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -SECURITY_APPARMOR_COMPAT_24=y #- #- *** FILE: security/integrity/ima/Kconfig *** @@ -7498,6 +7493,7 @@ RTC_DRV_MC13783 all=m RTL8187SE all=m RTL8192SU all=m +SECURITY_APPARMOR_COMPAT_24=y SECURITY_APPARMOR_DISABLE=n SECURITY_APPARMOR_NETWORK=y SECURITY_FILE_CAPABILITIES all=y ================================================================ Index: packages/kernel/kernel-patches.config diff -u packages/kernel/kernel-patches.config:1.9 packages/kernel/kernel-patches.config:1.10 --- packages/kernel/kernel-patches.config:1.9 Mon Feb 28 19:13:26 2011 +++ packages/kernel/kernel-patches.config Sun May 1 17:26:18 2011 @@ -21,8 +21,6 @@ UNION_FS_XATTR all=y UNION_FS_DEBUG all=n -SQUASHFS all=m -SQUASHFS_EMBEDDED all=n SQUASHFS_FRAGMENT_CACHE_SIZE all=3 SQUASHFS_LZMA all=y ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.67&r2=1.68&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit