From 3a53a3720329b0fceec30a85b17aa886ac9483b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Sat, 16 Apr 2011 02:58:28 +0200 Subject: [PATCH] Fixed debian/control and debian/rules Removed dependency on u-boot Provide kernel-feature-framebuffer --- kernel-power-2.6.28/debian/control | 4 ++-- kernel-power-2.6.28/debian/rules | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control index 59460e3..6c78f35 100644 --- a/kernel-power-2.6.28/debian/control +++ b/kernel-power-2.6.28/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Thomas Tanner XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528 -Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev, sharutils, uboot-mkimage, u-boot-for-power-kernel +Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev, sharutils Standards-Version: 3.8.0 Package: kernel-power-flasher @@ -18,7 +18,7 @@ Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, ke kernel-feature-unionfs, kernel-feature-crypto, kernel-feature-dmloop, kernel-feature-utf8, kernel-feature-mousejoy, 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-wlan-monitor, kernel-feature-radiords, kernel-feature-ioacct, kernel-feature-usbhost, kernel-feature-framebuffer XB-Maemo-Display-Name: Enhanced Linux kernel for power users Description: Linux kernel updater for an enhanced Maemo 5 kernel 2.6.28.10 This package will flash the kernel image upon installation. diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules index d813bb4..a3ebf78 100644 --- a/kernel-power-2.6.28/debian/rules +++ b/kernel-power-2.6.28/debian/rules @@ -4,12 +4,10 @@ WEEK := $(shell date +%Y%W) RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }') REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10power\2/') -#REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10powerusb\2/') EXTRAVERSION := EXTRAVERSION=$(REVISION) PACKAGE := kernel FLASHER_PACKAGE := kernel-power-flasher -#SOURCE_PACKAGE := $(PACKAGE)-source KERNEL_PACKAGE := $(PACKAGE)-power BOOTIMG_PACKAGE := $(PACKAGE)-power-bootimg MODULES_PACKAGE := $(PACKAGE)-power-modules @@ -44,28 +42,22 @@ endif configure-stamp: dh_testdir - #$(MAKE) mrproper KBUILD_OUTPUT=$(CURDIR) mkdir -p $(BUILDTMP) $(MAKE) clean QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2 cp debian/$(DEFCONFIG) arch/arm/configs/ - #uudecode debian/u-boot.bin.gz.b64 -o - | gunzip -dc > debian/u-boot.bin - #dd if=debian/u-boot.bin of=debian/u-boot.pad bs=262144 count=1 conv=sync cd $(KSRC) && $(MAKE) $(EXTRAVERSION) $(DEFCONFIG) touch $@ kernel-stamp: configure-stamp echo "compile $(PRODUCT) kernel" cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) zImage - #mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n kernel-power -d $(BUILDTMP)/arch/arm/boot/zImage $(BUILDTMP)/arch/arm/boot/uImage - #cat /usr/lib/u-boot/u-boot.bin.0x38000/u-boot.bin.0x38000 $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage - #cat debian/u-boot.pad $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage touch $@ modules-stamp: configure-stamp echo "compile $(PRODUCT) kernel modules" cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) modules - $(MAKE) -C $(KSRC) M=debian/joikuspot EXTRAVERSION=$(EXTRAVERSION) modules + $(MAKE) -C $(KSRC) M=debian/joikuspot $(EXTRAVERSION) modules touch $@ modules-extra: configure-stamp @@ -107,7 +99,6 @@ install-kernel: install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \ -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE) - -k debian/uImage -v $(RELEASE) chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco install-bootimg: @@ -128,7 +119,6 @@ install-modules: install -c -m 644 $$f $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \ strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \ done - #ln -sf $(KVER) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/current install-headers: dh_testdir @@ -141,6 +131,8 @@ install-headers: install -p -o root -g root -m 644 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/auto.conf \ $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/auto.conf + cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/kernel.release \ + $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/kernel.release cd $(KSRC) && \ find arch/$(ARCH) $(foreach dir,$(INCLUDE_HEADERS),include/$(dir)) -name '*.h' \ -exec install -D -m644 {} $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/{} \; -- 1.7.9.5