Fixed debian/control and debian/rules

[kernel-power] / kernel-power-2.6.28 / debian / rules

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index a551eaf..a3ebf78 100644 (file)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -8,10 +8,11 @@ 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
 HEADERS_PACKAGE := $(PACKAGE)-power-headers
+KBUILD_PACKAGE := $(PACKAGE)-power-kbuild
 LIBC_PACKAGE := linux-kernel-power-headers
 
 BUILDTMP := $(CURDIR)/debian/build
@@ -22,8 +23,8 @@ export KBUILD_OUTPUT = $(BUILDTMP)
 DEFCONFIG := rx51power_defconfig
 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
+INCLUDE_HEADERS = asm-$(ARCH) linux acpi asm-generic crypto drm Kbuild keys math-emu media mtd net pcmcia rdma rxrpc scsi sound video xen
 RM_SCRIPTS = bloat-o-meter show_delta
 DEBUG_MODULES = oprofile.ko
 MAKE += $(MAKEFLAGS)
@@ -45,7 +46,6 @@ configure-stamp:
        $(MAKE) clean
        QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2
        cp debian/$(DEFCONFIG) arch/arm/configs/
-
        cd $(KSRC) && $(MAKE) $(EXTRAVERSION) $(DEFCONFIG)
        touch $@
 
@@ -57,7 +57,7 @@ kernel-stamp: configure-stamp
 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
@@ -70,7 +70,7 @@ modules-extra: configure-stamp
 
 headers: kernel-stamp modules-stamp
 
-clean:
+clean-gen:
        dh_testdir
        dh_testroot
 
@@ -83,10 +83,12 @@ clean:
        rm -rf debian/tmp-*
        rm -rf debian/build
        rm -f *-stamp
+       -rm debian/u-boot.bin debian/u-boot.pad debian/uImage
+
+clean: clean-gen
        QUILT_PATCHES=debian/patches quilt pop -a -q -R || test $$? = 2
        -rm arch/arm/configs/$(DEFCONFIG)
        -rm -rf .pc
-
        dh_clean
 
 install-kernel:
@@ -99,6 +101,15 @@ install-kernel:
                        -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
 
+install-bootimg:
+       dh_testdir
+       dh_testroot
+       dh_installdirs
+
+       install -d -m 755 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot
+       install -c -m 644 $(BUILDTMP)/arch/arm/boot/zImage $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE)
+       chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE)
+
 install-modules:
        dh_testdir
        dh_testroot
@@ -108,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
@@ -121,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)/{} \;
@@ -147,9 +159,11 @@ install-headers:
 #install kbuild
        install -d $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE)
        cp -a $(KSRC)/scripts $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE)
+       cp -a $(BUILDTMP)/scripts $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE)
 #kbuild fixes
        cd $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE)/scripts && \
                ( rm -f $(RM_SCRIPTS); chmod a-x mkcompile_h )
+       find $(CURDIR)/debian/$(HEADERS_PACKAGE) -name ".gitignore" -exec rm {} \;
 
 install-libc-headers:
        dh_testdir
@@ -173,7 +187,7 @@ install-modules-extra:
 install-extra: install-modules-extra
 
 
-install-arch: build-arch install-kernel install-modules install-headers install-libc-headers
+install-arch: build-arch install-kernel install-bootimg install-modules install-headers install-libc-headers
 
 ifeq ($(ARCH),arm)
 build-arch: kernel-stamp modules-stamp headers