From 5961a11c2e648496f320ba9d50b5d539af338096 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Mon, 16 Jul 2012 20:43:50 +0200 Subject: [PATCH] Fix building packet injection modules, provides kernel-feature-usbhost-new --- kernel-power-2.6.28/debian/control | 5 +++-- kernel-power-2.6.28/debian/madde.patch | 2 +- kernel-power-2.6.28/debian/rules | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control index 4fd2f64..bde3bda 100644 --- a/kernel-power-2.6.28/debian/control +++ b/kernel-power-2.6.28/debian/control @@ -27,7 +27,8 @@ Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, ke kernel-feature-usbip, kernel-feature-ppp, kernel-feature-qos, kernel-feature-block2mtd, kernel-feature-kexec, kernel-feature-overclock, kernel-feature-joikuspot, kernel-feature-slip, kernel-feature-battery, kernel-feature-pptp, kernel-feature-wlan-monitor, kernel-feature-radiords, kernel-feature-ioacct, kernel-feature-usbhost, kernel-feature-framebuffer, - kernel-feature-smartreflex, kernel-feature-video720p, kernel-feature-packet-injection, kernel-feature-charger + kernel-feature-smartreflex, kernel-feature-video720p, kernel-feature-packet-injection, kernel-feature-charger, + kernel-feature-errata-430973-workaround, kernel-feature-usbhost-new XB-Maemo-Display-Name: Linux kernel for power user (boot image for multiboot) Description: Linux kernel boot image (kernel power 2.6.28.10) This package provides a bootable kernel image and config files @@ -118,7 +119,7 @@ Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, ke kernel-feature-overclock, kernel-feature-joikuspot, kernel-feature-slip, kernel-feature-battery, kernel-feature-pptp, kernel-feature-wlan-monitor, kernel-feature-radiords, kernel-feature-ioacct, kernel-feature-usbhost, kernel-feature-framebuffer, kernel-feature-smartreflex, kernel-feature-video720p, kernel-feature-packet-injection, kernel-feature-charger, - kernel-feature-errata-430973-workaround + kernel-feature-errata-430973-workaround, kernel-feature-usbhost-new XB-Maemo-Display-Name: Linux kernel for power user Description: Linux kernel updater (kernel power 2.6.28.10) This package will flash the kernel image upon installation. diff --git a/kernel-power-2.6.28/debian/madde.patch b/kernel-power-2.6.28/debian/madde.patch index e4cb141..9ef25fb 100644 --- a/kernel-power-2.6.28/debian/madde.patch +++ b/kernel-power-2.6.28/debian/madde.patch @@ -42,7 +42,7 @@ index a78394b..25397d5 100755 @@ -134,9 +139,9 @@ install-debug: install-modules mkdir -p $(CURDIR)/debian/$(DEBUG_PACKAGE)/lib/modules/$(RELEASE) install -m644 $(KSRC)/vmlinux $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-$(RELEASE) - for f in $$(find $(CURDIR)/debian/$(MODULES_PACKAGE) -name "*.ko"); do \ + for f in $$(find $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE) -name "*.ko"); do \ - objcopy --only-keep-debug $$f $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f); \ - strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \ - objcopy --add-gnu-debuglink $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \ diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules index a4eba01..1648508 100755 --- a/kernel-power-2.6.28/debian/rules +++ b/kernel-power-2.6.28/debian/rules @@ -84,7 +84,7 @@ packet-injection-configure-stamp: packet-injection-source-stamp cd $(COMPAT_WIRELESS_TREE) && ./scripts/driver-select wl12xx touch $@ -packet-injection-build-stamp: packet-injection-configure-stamp +packet-injection-build-stamp: kernel-stamp modules-stamp packet-injection-configure-stamp $(MAKE) -C $(COMPAT_WIRELESS_TREE) $(NJOBS) KLIB_BUILD=$(KSRC) touch $@ @@ -133,7 +133,7 @@ install-debug: install-modules mkdir -p $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE) mkdir -p $(CURDIR)/debian/$(DEBUG_PACKAGE)/lib/modules/$(RELEASE) install -m644 $(KSRC)/vmlinux $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-$(RELEASE) - for f in $$(find $(CURDIR)/debian/$(MODULES_PACKAGE) -name "*.ko"); do \ + for f in $$(find $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE) -name "*.ko"); do \ objcopy --only-keep-debug $$f $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f); \ strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \ objcopy --add-gnu-debuglink $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(RELEASE)/$$(basename $$f) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \ -- 1.7.9.5