From: tanner Date: Tue, 18 May 2010 09:23:03 +0000 (+0200) Subject: v32 X-Git-Url: http://vcs.maemo.org/git/?p=kernel-bfs;a=commitdiff_plain;h=15886d55ec22706863ec98faa8fe31e1c1c2bda3 v32 --- diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog index ec52806..c6c8ee9 100644 --- a/kernel-power-2.6.28/debian/changelog +++ b/kernel-power-2.6.28/debian/changelog @@ -1,3 +1,10 @@ +kernel-power (2.6.28-maemo32) fremantle; urgency=low + + * copied config from v27 + * modules.post*: don't fix preinit (is this the bug?) + + -- Thomas Tanner Mon, 17 May 2010 21:27:36 +0200 + kernel-power (2.6.28-maemo31) fremantle; urgency=low * reverted the remaining changes to v27 diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in index 8264cc2..e8341fc 100644 --- a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in +++ b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in @@ -10,11 +10,11 @@ ls -1d * | grep -v current | while read i; do done ln -s @KVER@ /lib/modules/current -if grep -q "MODULE_PATH=/lib/modules/current" /sbin/preinit; then - sed 's%MODULE_PATH=/lib/modules/current%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%' /sbin/preinit > /sbin/preinit.tmp && \ - chmod +x /sbin/preinit.tmp && \ - mv /sbin/preinit.tmp /sbin/preinit -fi +#if grep -q "MODULE_PATH=/lib/modules/current" /sbin/preinit; then +# sed 's%MODULE_PATH=/lib/modules/current%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%' /sbin/preinit > /sbin/preinit.tmp && \ +# chmod +x /sbin/preinit.tmp && \ +# mv /sbin/preinit.tmp /sbin/preinit +#fi #DEBHELPER# diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in index ed1e2cb..30b5ec1 100644 --- a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in +++ b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in @@ -6,11 +6,11 @@ test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.* rm -f /lib/modules/current ln -s 2.6.28-omap1 /lib/modules/current -if test "$1" != upgrade && grep -q 'MODULE_PATH=/lib/modules/`uname -r`' /sbin/preinit; then - sed 's%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%MODULE_PATH=/lib/modules/current%' /sbin/preinit > /sbin/preinit.tmp && \ - chmod +x /sbin/preinit.tmp && \ - mv /sbin/preinit.tmp /sbin/preinit -fi +#if test "$1" != upgrade && grep -q 'MODULE_PATH=/lib/modules/`uname -r`' /sbin/preinit; then +# sed 's%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%MODULE_PATH=/lib/modules/current%' /sbin/preinit > /sbin/preinit.tmp && \ +# chmod +x /sbin/preinit.tmp && \ +# mv /sbin/preinit.tmp /sbin/preinit +#fi #DEBHELPER# diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig index 8e397c3..b24840f 100644 --- a/kernel-power-2.6.28/debian/rx51power_defconfig +++ b/kernel-power-2.6.28/debian/rx51power_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28.10power-omap1 -# Mon May 17 07:47:34 2010 +# Sun May 2 13:08:58 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -295,7 +295,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PREEMPT=y CONFIG_HZ=128 CONFIG_AEABI=y -#CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set CONFIG_ARCH_FLATMEM_HAS_HOLES=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set @@ -354,8 +354,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y # # At least one emulation must be selected # -# CONFIG_FPE_NWFPE is not set -# CONFIG_FPE_FASTFPE is not set CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y @@ -615,7 +613,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_GRED is not set CONFIG_NET_SCH_DSMARK=m # CONFIG_NET_SCH_NETEM is not set -#CONFIG_NET_SCH_INGRESS=m +# CONFIG_NET_SCH_INGRESS is not set # # Classification @@ -629,7 +627,7 @@ CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set # CONFIG_CLS_U32_MARK is not set CONFIG_NET_CLS_RSVP=m -#CONFIG_NET_CLS_RSVP6=m +# CONFIG_NET_CLS_RSVP6 is not set CONFIG_NET_CLS_FLOW=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y @@ -1531,7 +1529,12 @@ CONFIG_DISPLAY_SUPPORT=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +#CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +#CONFIG_FONT_8x8=y +#CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set @@ -1630,11 +1633,16 @@ CONFIG_USB_MON=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_EHCI_HCD is not set -# CONFIG_OMAP_EHCI_PHY_MODE is not set +#CONFIG_USB_EHCI_HCD=m +#CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_OHCI_HCD is not set +#CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +#CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set @@ -1757,6 +1765,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set