From 1e40d281c2b73d1cab65a6a44f09d9a06b6437ab Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 17 Aug 2013 13:50:48 +0200 Subject: [PATCH] projects/*/linux: set CONFIG_MMC_BLOCK_MINORS to 32 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/system.d/xbmc.service | 2 +- packages/x11/other/ratpoison/system.d/ratpoison.service | 9 +++++---- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf.deprecated | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf.deprecated | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/RPi/linux/linux.arm.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service index d965abdfde..7768fd4c5f 100644 --- a/packages/mediacenter/xbmc/system.d/xbmc.service +++ b/packages/mediacenter/xbmc/system.d/xbmc.service @@ -1,6 +1,6 @@ [Unit] Description=XBMC Media Center -After=graphical.target +After=xorg.target graphical.target Requires=graphical.target [Service] diff --git a/packages/x11/other/ratpoison/system.d/ratpoison.service b/packages/x11/other/ratpoison/system.d/ratpoison.service index 24a2584cb5..d40e6c262c 100644 --- a/packages/x11/other/ratpoison/system.d/ratpoison.service +++ b/packages/x11/other/ratpoison/system.d/ratpoison.service @@ -1,11 +1,12 @@ [Unit] Description=Ratpoison Window Manager -After=xorg-server.service -Requires=graphical.target +After=xorg.target +Requires=xorg.target graphical.target [Service] -Environment=DISPLAY=:0.0 -ExecStart=/bin/sh -c 'sleep 1; exec /usr/bin/ratpoison' +Environment=DISPLAY=:0 +# ExecStart=/bin/sh -c 'sleep 1; exec /usr/bin/ratpoison' +ExecStart=/usr/bin/ratpoison --file /etc/ratpoisonrc KillMode=process Restart=always diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 8e9ed36fa5..7de3e32119 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -3076,7 +3076,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 3ab479c57f..b3eda74cbc 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -3107,7 +3107,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index d9355f4680..d140294ff1 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -3074,7 +3074,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 9f2c832a0f..28017b17f4 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -3110,7 +3110,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/ION/linux/linux.i386.conf.deprecated b/projects/ION/linux/linux.i386.conf.deprecated index bdc7ff5842..98bdae1257 100644 --- a/projects/ION/linux/linux.i386.conf.deprecated +++ b/projects/ION/linux/linux.i386.conf.deprecated @@ -2995,7 +2995,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index e1742bb7d2..7b5311ea53 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -2928,7 +2928,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Intel/linux/linux.i386.conf.deprecated b/projects/Intel/linux/linux.i386.conf.deprecated index db6a3b8271..126a761662 100644 --- a/projects/Intel/linux/linux.i386.conf.deprecated +++ b/projects/Intel/linux/linux.i386.conf.deprecated @@ -3048,7 +3048,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 459112421a..871524c976 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -2994,7 +2994,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index dcf10f3acc..80f4a2e180 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -2147,7 +2147,7 @@ CONFIG_MMC=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 9956f1253e..a68f435937 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -3109,7 +3109,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 8e9ed36fa5..7de3e32119 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -3076,7 +3076,7 @@ CONFIG_MMC=m # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set