From: Pali Rohár Date: Sat, 9 Jul 2011 10:44:29 +0000 (+0200) Subject: Fixed debian/rules X-Git-Tag: kernel-power-settings-0.12~14 X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=2ce2c69ed57b38dc560664fe16fe699aa4248620;hp=0e9421f360747110125d39b265728b814dc200eb;p=kernel-power Fixed debian/rules --- diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules index 37b6a9f..834e1d7 100755 --- a/kernel-power-2.6.28/debian/rules +++ b/kernel-power-2.6.28/debian/rules @@ -26,7 +26,6 @@ KSRC := $(BUILDTMP)/$(PACKAGE) export KBUILD_OUTPUT = $(BUILDTMP) DEFCONFIG := rx51_defconfig -KVER = $(shell cat $(KSRC)/include/config/kernel.release 2> /dev/null) ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) 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 @@ -50,16 +49,14 @@ get-orig-source: source-copy-stamp: dh_testdir - $(MAKE) clean - mkdir -p $(BUILDTMP)/$(SOURCE_PACKAGE) - QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2 - tar cf - `echo * | sed -e 's/ debian//g' -e 's/\.deb//g' ` \ - | (cd $(BUILDTMP)/$(SOURCE_PACKAGE) ; umask 000; tar xspf -) + $(MAKE) clean + tar cf - `echo * | sed -e 's/ debian//g' -e 's/\.deb//g' ` | (cd $(BUILDTMP)/$(SOURCE_PACKAGE); umask 000; tar xspf -) + cd $(BUILDTMP)/$(SOURCE_PACKAGE) && ( QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a -q || test $$? = 2 ) touch $@ source-stamp: source-copy-stamp - cd $(BUILDTMP) && cp -a $(SOURCE_PACKAGE) $(KSRC) + cd $(BUILDTMP) && cp -a $(SOURCE_PACKAGE) $(KSRC) touch $@ configure-stamp: source-stamp @@ -67,115 +64,93 @@ configure-stamp: source-stamp touch $@ kernel-stamp: configure-stamp - echo "compile $(PRODUCT) kernel" cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) zImage touch $@ modules-stamp: configure-stamp - echo "compile $(PRODUCT) kernel modules" cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) modules touch $@ headers: kernel-stamp modules-stamp kernel-source-stamp: source-copy-stamp - dh_testdir - - cd $(BUILDTMP) && \ - tar --bzip2 -cf $(SOURCE_PACKAGE)-$(RELEASE).tar.bz2 $(SOURCE_PACKAGE) + cd $(BUILDTMP) && tar --bzip2 -cf $(SOURCE_PACKAGE)-$(RELEASE).tar.bz2 $(SOURCE_PACKAGE) touch $@ clean: dh_testdir dh_testroot - - $(MAKE) mrproper - rm -f scripts/basic/{docproc,fixdep,hash} scripts/kconfig/mconf scripts/kconfig/*.o scripts/kconfig/lxdialog/*.o - rm -f modules/modversions.h modules/ksyms.ver debian/files conf.vars scripts/cramfs/cramfsck \ - scripts/cramfs/mkcramfs applied_patches debian/buildinfo stamp-* .config* \ - debian/$(FLASHER_PACKAGE).postinst debian/$(MODULES_PACKAGE).postinst debian/$(MODULES_PACKAGE).postrm - rm -rf debian/tmp-* - rm -rf debian/build - rm -f *-stamp - - QUILT_PATCHES=debian/patches quilt pop -a -q -R || test $$? = 2 - rm -rf .pc + rm -rf $(BUILDTMP) + rm -f debian/files debian/tmp-* stamp-* *-stamp + rm -f debian/$(FLASHER_PACKAGE).postinst debian/$(MODULES_PACKAGE).postinst debian/$(MODULES_PACKAGE).postrm dh_clean install-kernel: dh_testdir dh_testroot - dh_installdirs - - 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) + mkdir -p $(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) chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco install-bootimg: dh_testdir dh_testroot - dh_installdirs - - install -m 644 $(BUILDTMP)/arch/arm/boot/zImage $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE) - install -d -m 755 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTDIR) + mkdir -p $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot + mkdir -p $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTDIR) + install -m644 $(BUILDTMP)/arch/arm/boot/zImage $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE) echo "ITEM_NAME=\"Maemo $(PACKAGE) $(RELEASE)\"" > $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE) echo "ITEM_KERNEL=\"$(RELEASE)\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE) echo "ITEM_MODULES=\"ext3\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE) + chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE) install-flasher: dh_testdir dh_testroot - dh_installdirs - - install -m 644 $(CURDIR)/debian/kernel-power-flasher.sudoers $(CURDIR)/debian/$(FLASHER_PACKAGE)/etc/sudoers.d - install -m 755 $(CURDIR)/debian/kernel-power-deinstall $(CURDIR)/debian/$(FLASHER_PACKAGE)/usr/sbin - install -m 644 $(CURDIR)/debian/kernel-power-deinstall.desktop $(CURDIR)/debian/$(FLASHER_PACKAGE)/usr/share/applications/hildon + mkdir -p $(CURDIR)/debian/$(FLASHER_PACKAGE)/etc/sudoers.d + mkdir -p $(CURDIR)/debian/$(FLASHER_PACKAGE)/usr/sbin + mkdir -p $(CURDIR)/debian/$(FLASHER_PACKAGE)/usr/share/applications/hildon + install -m644 $(CURDIR)/debian/kernel-power-flasher.sudoers $(CURDIR)/debian/$(FLASHER_PACKAGE)/etc/sudoers.d + install -m755 $(CURDIR)/debian/kernel-power-uninstall $(CURDIR)/debian/$(FLASHER_PACKAGE)/usr/sbin + install -m644 $(CURDIR)/debian/kernel-power-uninstall.desktop $(CURDIR)/debian/$(FLASHER_PACKAGE)/usr/share/applications/hildon install-debug: install-modules - install -d -m 755 $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(KVER) - install $(KSRC)/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) - + 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 \ - 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); \ + 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); \ done install-modules-debug: install-debug - install -d -m 755 $(CURDIR)/debian/$(DEBUG_MODULES_PACKAGE)/lib/modules/$(KVER) + mkdir -p $(CURDIR)/debian/$(DEBUG_MODULES_PACKAGE)/lib/modules/$(RELEASE) -for f in $(DEBUG_MODULES); do \ - mv $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$f \ - $(CURDIR)/debian/$(DEBUG_MODULES_PACKAGE)/lib/modules/$(KVER)/$$f; \ + mv $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$f \ + $(CURDIR)/debian/$(DEBUG_MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$f; \ done install-modules: dh_testdir dh_testroot - - mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER) + mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE) + mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d for f in $$(find $(KSRC) -name "*.ko"); do \ - 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); \ + install -c -m644 $$f $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \ + strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(RELEASE)/$$(basename $$f); \ done - ln -sf $(KVER) $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/current install -m644 $(CURDIR)/debian/blacklist $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d install-headers: dh_testdir dh_testroot - dh_installdirs - - install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - install -p -o root -g root -m 644 $(KSRC)/.config $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - install -p -o root -g root -m 644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - install -p -o root -g root -m 644 $(KSRC)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - cd $(KSRC) && install -p -o root -g root -m 644 -D include/config/auto.conf \ + mkdir -p $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ + install -p -m644 $(KSRC)/.config $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ + install -p -m644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ + install -p -m644 $(KSRC)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ + cd $(KSRC) && install -p -m 644 -D include/config/auto.conf \ $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/auto.conf - cd $(KSRC) && install -p -o root -g root -m 644 -D include/config/kernel.release \ + cd $(KSRC) && install -p -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' \ @@ -186,41 +161,30 @@ install-headers: cd $(KSRC) && \ find ./ -path "./debian" -prune -o -path "./.pc" -prune -o \( -name Makefile -or -name Kbuild -or -name Kconfig\* \) \ -exec install -D -m644 {} $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/{} \; - ln -sf asm-$(ARCH) $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/asm - rm -rf $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/scripts ln -sf ../$(KBUILD_PACKAGE)/scripts $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE) - -# cp -a $(KSRC)/include/asm-$(ARCH)/arch \ -# $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/asm-$(ARCH) - - cp $(KSRC)/arch/$(ARCH)/kernel/asm-offsets.s \ - $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/arch/$(ARCH)/kernel + cp $(KSRC)/arch/$(ARCH)/kernel/asm-offsets.s $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/arch/$(ARCH)/kernel #install /lib/modules symlink - install -d -m 755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/lib/modules/$(KVER)/ - ln -sf /usr/src/$(HEADERS_PACKAGE) $(CURDIR)/debian/$(HEADERS_PACKAGE)/lib/modules/$(KVER)/build + mkdir -p $(CURDIR)/debian/$(HEADERS_PACKAGE)/lib/modules/$(RELEASE) + ln -sf /usr/src/$(HEADERS_PACKAGE) $(CURDIR)/debian/$(HEADERS_PACKAGE)/lib/modules/$(RELEASE)/build #install kbuild - install -d $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE) + mkdir -p $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE) cp -a $(KSRC)/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 ) + 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" -delete install-libc-headers: source-stamp dh_testdir dh_testroot - - cd $(KSRC) && \ - $(MAKE) headers_check ARCH=$(ARCH) && \ - $(MAKE) headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(CURDIR)/debian/$(LIBC_PACKAGE)/usr + cd $(KSRC) && $(MAKE) headers_check ARCH=$(ARCH) + cd $(KSRC) && $(MAKE) headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(CURDIR)/debian/$(LIBC_PACKAGE)/usr install-indep: dh_testdir dh_testroot - - install -p -d -o root -g root -m 755 debian/$(SOURCE_PACKAGE)/usr/src + mkdir -p debian/$(SOURCE_PACKAGE)/usr/src install -m 644 $(BUILDTMP)/$(SOURCE_PACKAGE)-$(RELEASE).tar.bz2 debian/$(SOURCE_PACKAGE)/usr/src install-arch: build-arch install-kernel install-bootimg install-flasher install-modules install-debug install-modules-debug install-headers install-libc-headers @@ -252,15 +216,15 @@ binary-arch: install-libc-headers endif sed \ -e 's,@VERSION@,$(RELEASE),g' \ - -e 's,@KVER@,$(KVER),g' \ + -e 's,@RELEASE@,$(RELEASE),g' \ < $(CURDIR)/debian/$(FLASHER_PACKAGE).postinst.in \ > $(CURDIR)/debian/$(FLASHER_PACKAGE).postinst sed \ - -e 's,@KVER@,$(KVER),g' \ + -e 's,@RELEASE@,$(RELEASE),g' \ < $(CURDIR)/debian/$(MODULES_PACKAGE).postinst.in \ > $(CURDIR)/debian/$(MODULES_PACKAGE).postinst sed \ - -e 's,@KVER@,$(KVER),g' \ + -e 's,@RELEASE@,$(RELEASE),g' \ < $(CURDIR)/debian/$(MODULES_PACKAGE).postrm.in \ > $(CURDIR)/debian/$(MODULES_PACKAGE).postrm dh_testdir @@ -277,5 +241,5 @@ endif dh_gencontrol -s dh_md5sums -s dh_builddeb -s -binary: binary-indep binary-arch +binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install