From: tanner Date: Thu, 15 Apr 2010 09:49:17 +0000 (+0200) Subject: old version maemo12 X-Git-Tag: kernel-power-settings-0.3~13 X-Git-Url: http://git.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=a0f34b8f1fa622cf19802bf06ea955b31e93eddb old version maemo12 --- diff --git a/kernel-maemo-2.6.28/debian/changelog b/kernel-maemo-2.6.28/debian/changelog index c1aef3b..40e7715 100644 --- a/kernel-maemo-2.6.28/debian/changelog +++ b/kernel-maemo-2.6.28/debian/changelog @@ -1,3 +1,11 @@ +kernel-maemo (2.6.28-maemo12) fremantle; urgency=low + + * enabled g_serial and usb ethernet gadget + * fix broken installation of modules + * add Matan's ppp_async patch + + -- Thomas Tanner Sun, 28 Feb 2010 00:00:00 +0100 + kernel-maemo (2.6.28-maemo11) fremantle; urgency=low * enabled PPP module diff --git a/kernel-maemo-2.6.28/debian/patches/ppp_async_matan.diff b/kernel-maemo-2.6.28/debian/patches/ppp_async_matan.diff new file mode 100644 index 0000000..25119aa --- /dev/null +++ b/kernel-maemo-2.6.28/debian/patches/ppp_async_matan.diff @@ -0,0 +1,28 @@ +--- kernel-maemo-2.6.28.orig/drivers/net/ppp_async.c ++++ kernel-maemo-2.6.28/drivers/net/ppp_async.c +@@ -346,7 +346,7 @@ + * This can now be called from hard interrupt level as well + * as soft interrupt level or mainline. + */ +-static void ++static int + ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, + char *cflags, int count) + { +@@ -354,7 +354,7 @@ + unsigned long flags; + + if (!ap) +- return; ++ return 0; + spin_lock_irqsave(&ap->recv_lock, flags); + ppp_async_input(ap, buf, cflags, count); + spin_unlock_irqrestore(&ap->recv_lock, flags); +@@ -362,6 +362,7 @@ + tasklet_schedule(&ap->tsk); + ap_put(ap); + tty_unthrottle(tty); ++ return count; + } + + static void diff --git a/kernel-maemo-2.6.28/debian/patches/series b/kernel-maemo-2.6.28/debian/patches/series index bd2ef40..1efb587 100644 --- a/kernel-maemo-2.6.28/debian/patches/series +++ b/kernel-maemo-2.6.28/debian/patches/series @@ -6,3 +6,4 @@ usbip.diff nilfs2-2.0.18.diff minstrel-aziwoqpa.diff iphb-matan.diff +ppp_async_matan.diff diff --git a/kernel-maemo-2.6.28/debian/rules b/kernel-maemo-2.6.28/debian/rules index 2145c17..35361ba 100644 --- a/kernel-maemo-2.6.28/debian/rules +++ b/kernel-maemo-2.6.28/debian/rules @@ -25,7 +25,7 @@ KSRC := $(CURDIR) export KBUILD_OUTPUT = $(BUILDTMP) DEFCONFIG := rx51maemo_defconfig -KVER = $(shell cat $(KSRC)/include/config/kernel.release 2> /dev/null) +KVER = $(shell cat $(BUILDTMP)/include/config/kernel.release 2> /dev/null) ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) INCLUDE_HEADERS = acpi asm-generic crypto drm Kbuild keys math-emu media mtd net pcmcia rdma rxrpc scsi sound video xen INCLUDE_HEADERS_ARCH = asm-$(ARCH) config linux @@ -108,26 +108,6 @@ install-kernel: #rm -rf debian/fiasco debian/fiasco.deb chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -install-debug: install-modules - install -d -m 755 $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(KVER) - install $(BUILDTMP)/vmlinux \ - $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-$(KVER) - chmod a-x $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-* - mkdir -p $(CURDIR)/debian/$(DEBUG_PACKAGE)/lib/modules/$(KVER) - - for f in $$(find $(CURDIR)/debian/$(MODULES_PACKAGE) -name "*.ko"); do \ - objcopy --only-keep-debug $$f $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(KVER)/$$(basename $$f); \ - strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \ - objcopy --add-gnu-debuglink $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(KVER)/$$(basename $$f) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \ - done - -install-modules-debug: install-debug - install -d -m 755 $(CURDIR)/debian/$(DEBUG_MODULES_PACKAGE)/lib/modules/$(KVER) - -for f in $(DEBUG_MODULES); do \ - mv $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$f \ - $(CURDIR)/debian/$(DEBUG_MODULES_PACKAGE)/lib/modules/$(KVER)/$$f; \ - done - install-modules: dh_testdir dh_testroot diff --git a/kernel-maemo-2.6.28/debian/rx51maemo_defconfig b/kernel-maemo-2.6.28/debian/rx51maemo_defconfig index ebdd075..99788e7 100644 --- a/kernel-maemo-2.6.28/debian/rx51maemo_defconfig +++ b/kernel-maemo-2.6.28/debian/rx51maemo_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28maemo-omap1 -# Sun Feb 28 15:42:09 2010 +# Sun Feb 28 20:48:24 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1772,11 +1772,12 @@ CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m # CONFIG_USB_ZERO_HNPTEST is not set -# CONFIG_USB_ETH is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set CONFIG_USB_FILE_STORAGE=m CONFIG_USB_FILE_STORAGE_TEST=y -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set