From: tanner Date: Tue, 18 May 2010 21:45:35 +0000 (+0200) Subject: v33 X-Git-Tag: hostmode-1~6 X-Git-Url: http://git.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=e744c40a79670cf42af734b376cb96078f41dcfc v33 --- diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog index c6c8ee9..5939291 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-maemo33) fremantle; urgency=low + + * enable all v28 features again, except for OABI + (commenting out features in configuration had no effect) + + -- Thomas Tanner Tue, 18 May 2010 23:13:39 +0200 + kernel-power (2.6.28-maemo32) fremantle; urgency=low * copied config from 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 e8341fc..8264cc2 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 30b5ec1..ed1e2cb 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 b24840f..5975f46 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 -# Sun May 2 13:08:58 2010 +# Tue May 18 22:34:34 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -401,8 +401,8 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_ASK_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_MULTIPLE_TABLES is not set -# CONFIG_IP_ROUTE_MULTIPATH is not set +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y # CONFIG_IP_ROUTE_VERBOSE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y @@ -613,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 is not set +CONFIG_NET_SCH_INGRESS=m # # Classification @@ -627,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 is not set +CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y @@ -675,6 +675,7 @@ CONFIG_BT_HIDP=m CONFIG_BT_HCIH4P=m # CONFIG_BT_HCIVHCI is not set # CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_CFG80211=y CONFIG_NL80211=y @@ -1529,12 +1530,7 @@ CONFIG_DISPLAY_SUPPORT=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -#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_FRAMEBUFFER_CONSOLE is not set # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set @@ -1633,16 +1629,9 @@ CONFIG_USB_MON=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD 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_EHCI_HCD is not set # CONFIG_USB_ISP116X_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_OHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set @@ -1765,7 +1754,6 @@ 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 @@ -1825,7 +1813,7 @@ CONFIG_MMC_UNSAFE_RESUME=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m -# CONFIG_MMC_BLOCK_BOUNCE is not set +CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set