[arch-commits] Commit in linux-grsec/trunk (PKGBUILD config config.x86_64)
Daniel Micay
thestinger at nymeria.archlinux.org
Thu Jun 19 21:23:57 UTC 2014
Date: Thursday, June 19, 2014 @ 23:23:57
Author: thestinger
Revision: 113362
linux-grsec: update to match the core/linux config
Modified:
linux-grsec/trunk/PKGBUILD
linux-grsec/trunk/config
linux-grsec/trunk/config.x86_64
---------------+
PKGBUILD | 4 ++--
config | 24 ++++++++++++++----------
config.x86_64 | 24 ++++++++++++++----------
3 files changed, 30 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-19 21:13:46 UTC (rev 113361)
+++ PKGBUILD 2014-06-19 21:23:57 UTC (rev 113362)
@@ -37,8 +37,8 @@
'0edab0f772836162e5e57ef294d83e88153c15a12f394914c6a25b49e408e8f1'
'aa9d8c11e1c1790e71088ae0a6494b8e44b0734f8e5d4fdeb9b98e0c77427406'
'SKIP'
- '60566eba74af1e121480a6839006e6e51e664a963a32ec1075ff9331da0355e5'
- '0b321b76ac4602d6c558dbba215b5fdd415c060bfbb91f93e535d6573f092e6c'
+ '1b46f4fca87952872aa58bb3aa76155ad77ca7ca4cd1a2b548dac1321feb46d8'
+ '28eb4217564c40416c2cf68ecc2774a373d0400979d486b0aa1de4f2674045dc'
'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
'6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
Modified: config
===================================================================
--- config 2014-06-19 21:13:46 UTC (rev 113361)
+++ config 2014-06-19 21:23:57 UTC (rev 113362)
@@ -142,7 +142,7 @@
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_KMEM is not set
# CONFIG_CGROUP_HUGETLB is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
@@ -1476,7 +1476,7 @@
CONFIG_FW_LOADER=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
@@ -4085,7 +4085,9 @@
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
CONFIG_VIDEO_RENESAS_VSP1=m
-# CONFIG_V4L_TEST_DRIVERS is not set
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
#
# Supported MMC/SDIO adapters
@@ -4900,9 +4902,7 @@
#
CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_OTG=y
-CONFIG_USB_OTG_WHITELIST=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4923,7 +4923,7 @@
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_FOTG210_HCD is not set
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
@@ -5090,7 +5090,7 @@
# USB Physical Layer drivers
#
CONFIG_USB_PHY=y
-CONFIG_USB_OTG_FSM=m
+# CONFIG_USB_OTG_FSM is not set
CONFIG_NOP_USB_XCEIV=m
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
@@ -5111,7 +5111,7 @@
# USB Peripheral Controller
#
CONFIG_USB_FUSB300=m
-CONFIG_USB_FOTG210_UDC=m
+# CONFIG_USB_FOTG210_UDC is not set
CONFIG_USB_GR_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
@@ -6045,7 +6045,11 @@
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
CONFIG_PSTORE=y
# CONFIG_PSTORE_CONSOLE is not set
# CONFIG_PSTORE_FTRACE is not set
Modified: config.x86_64
===================================================================
--- config.x86_64 2014-06-19 21:13:46 UTC (rev 113361)
+++ config.x86_64 2014-06-19 21:23:57 UTC (rev 113362)
@@ -151,7 +151,7 @@
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_KMEM is not set
# CONFIG_CGROUP_HUGETLB is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
@@ -1461,7 +1461,7 @@
CONFIG_FW_LOADER=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
CONFIG_SYS_HYPERVISOR=y
@@ -3963,7 +3963,9 @@
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
CONFIG_VIDEO_RENESAS_VSP1=m
-# CONFIG_V4L_TEST_DRIVERS is not set
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
#
# Supported MMC/SDIO adapters
@@ -4726,9 +4728,7 @@
#
CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_OTG=y
-CONFIG_USB_OTG_WHITELIST=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4749,7 +4749,7 @@
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_FOTG210_HCD is not set
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
@@ -4914,7 +4914,7 @@
# USB Physical Layer drivers
#
CONFIG_USB_PHY=y
-CONFIG_USB_OTG_FSM=m
+# CONFIG_USB_OTG_FSM is not set
CONFIG_NOP_USB_XCEIV=m
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
@@ -4934,7 +4934,7 @@
#
# USB Peripheral Controller
#
-CONFIG_USB_FOTG210_UDC=m
+# CONFIG_USB_FOTG210_UDC is not set
CONFIG_USB_GR_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
@@ -5826,7 +5826,11 @@
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
CONFIG_PSTORE=y
# CONFIG_PSTORE_CONSOLE is not set
# CONFIG_PSTORE_FTRACE is not set
More information about the arch-commits
mailing list