X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=kernel-power-2.6.28%2Fdebian%2Frules;h=934fb67e3b9d07e5ed8c9c347fa4b67039b8c448;hb=2ea12d125fda253107923443063eede3a28e22ca;hp=834e1d78d7680bc28ccb8c910e9f08945461924c;hpb=2ce2c69ed57b38dc560664fe16fe699aa4248620;p=kernel-power

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index 834e1d7..934fb67 100755
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 #
 
-WEEK := $(shell date +%Y%W)
 RELEASE := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*\)/\1/p' | sed 's/-10/.10-/')
 REVISION := $(shell echo "$(RELEASE)" | sed 's/.*\./\./')
 EXTRAVERSION := EXTRAVERSION=$(REVISION)
@@ -19,11 +18,12 @@ DEBUG_MODULES_PACKAGE := $(PACKAGE)-modules-debug
 LIBC_PACKAGE := linux-$(PACKAGE)-headers
 
 MULTIBOOTDIR := etc/multiboot.d
-MULTIBOOTFILE := $(MULTIBOOTDIR)/01-Maemo-$(PACKAGE)-$(RELEASE).item
+MULTIBOOTFILE := $(MULTIBOOTDIR)/20-Maemo5-$(PACKAGE)-$(RELEASE).item
+BOOTMENUDIR := etc/bootmenu.d
+BOOTMENUFILE := $(BOOTMENUDIR)/20-Maemo5-$(PACKAGE)-$(RELEASE).item
 
 BUILDTMP := $(CURDIR)/debian/build
 KSRC := $(BUILDTMP)/$(PACKAGE)
-export KBUILD_OUTPUT = $(BUILDTMP)
 
 DEFCONFIG := rx51_defconfig
 ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@ -31,7 +31,6 @@ 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)
 
 ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
     PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
@@ -45,51 +44,43 @@ ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
 endif
 
 get-orig-source:
-	wget ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.gz
+	wget http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28.orig.tar.gz -O kernel-power_2.6.28.orig.tar.gz
 
-source-copy-stamp:
+source-stamp:
 	dh_testdir
-	mkdir -p $(BUILDTMP)/$(SOURCE_PACKAGE)
-	$(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)
+	mkdir -p $(KSRC)
+	tar cf - `echo * | sed -e 's/ debian / /g;s/ [^ ]*\.deb / /g;s/ [^ ]*\.gz / /g;s/ [^ ]*fiasco[^ ]* / /g'` 2>/dev/null | ( cd $(KSRC); umask 000; tar xspf - )
+	cd $(KSRC) && ( QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a -q || test $$? = 2 )
+	cd $(BUILDTMP) && tar --exclude=".pc" --bzip2 -cf $(SOURCE_PACKAGE)-$(RELEASE).tar.bz2 $(PACKAGE)
 	touch $@
 
 configure-stamp: source-stamp
-	cd $(KSRC) && $(MAKE) $(EXTRAVERSION) $(DEFCONFIG)
+	$(MAKE) -C $(KSRC) $(NJOBS) $(EXTRAVERSION) $(DEFCONFIG)
 	touch $@
 
 kernel-stamp: configure-stamp
-	cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) zImage
+	$(MAKE) -C $(KSRC) $(NJOBS) $(EXTRAVERSION) zImage
 	touch $@
 
 modules-stamp: configure-stamp
-	cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) modules
+	$(MAKE) -C $(KSRC) $(NJOBS) $(EXTRAVERSION) modules
 	touch $@
 
 headers: kernel-stamp modules-stamp
 
-kernel-source-stamp: source-copy-stamp
-	cd $(BUILDTMP) && tar --bzip2 -cf $(SOURCE_PACKAGE)-$(RELEASE).tar.bz2 $(SOURCE_PACKAGE)
-	touch $@
-
 clean:
 	dh_testdir
 	dh_testroot
 	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
+	rm -f debian/files debian/$(FLASHER_PACKAGE).postinst debian/$(MODULES_PACKAGE).postinst debian/$(MODULES_PACKAGE).postrm
+	rm -f source-stamp configure-stamp kernel-stamp modules-stamp
 	dh_clean
 
 install-kernel:
 	dh_testdir
 	dh_testroot
 	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)
+	fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g -k $(KSRC)/arch/arm/boot/zImage -v $(RELEASE)
 	chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
 
 install-bootimg:
@@ -97,11 +88,14 @@ install-bootimg:
 	dh_testroot
 	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)
+	mkdir -p $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUDIR)
+	install -m644 $(KSRC)/arch/arm/boot/zImage $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/boot/zImage-$(RELEASE)
+	echo "ITEM_NAME=\"Maemo 5 with $(PACKAGE) $(RELEASE) (Internal Nand)\"" > $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
 	echo "ITEM_KERNEL=\"$(RELEASE)\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
-	echo "ITEM_MODULES=\"ext3\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+	echo "ITEM_REUSEATAGS=\"1\"" >> $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+	cp $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE) $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
 	chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(MULTIBOOTFILE)
+	chmod 644 $(CURDIR)/debian/$(BOOTIMG_PACKAGE)/$(BOOTMENUFILE)
 
 install-flasher:
 	dh_testdir
@@ -139,7 +133,7 @@ install-modules:
 		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
-	install -m644 $(CURDIR)/debian/blacklist $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d
+	install -m644 $(CURDIR)/debian/kernel-power.blacklist $(CURDIR)/debian/$(MODULES_PACKAGE)/etc/modprobe.d
 
 install-headers:
 	dh_testdir
@@ -173,13 +167,13 @@ install-headers:
 	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
-	find $(CURDIR)/debian/$(HEADERS_PACKAGE) -name ".gitignore" -delete
+	#find $(CURDIR)/debian/$(HEADERS_PACKAGE) -name ".gitignore" -delete
 
 install-libc-headers: source-stamp
 	dh_testdir
 	dh_testroot
-	cd $(KSRC) && $(MAKE) headers_check ARCH=$(ARCH)
-	cd $(KSRC) && $(MAKE) headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(CURDIR)/debian/$(LIBC_PACKAGE)/usr
+	$(MAKE) -C $(KSRC) headers_check ARCH=$(ARCH)
+	$(MAKE) -C $(KSRC) headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(CURDIR)/debian/$(LIBC_PACKAGE)/usr
 
 install-indep:
 	dh_testdir
@@ -195,7 +189,7 @@ else
 build-arch:
 endif
 
-build-indep: kernel-source-stamp
+build-indep: source-stamp
 
 build: build-arch build-indep
 
@@ -215,7 +209,6 @@ else
 binary-arch: install-libc-headers
 endif
 	sed \
-		-e 's,@VERSION@,$(RELEASE),g' \
 		-e 's,@RELEASE@,$(RELEASE),g' \
 		< $(CURDIR)/debian/$(FLASHER_PACKAGE).postinst.in \
 		> $(CURDIR)/debian/$(FLASHER_PACKAGE).postinst