[kernel] r7905 - people/waldi/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Sat Dec  2 14:41:18 2006
New Revision: 7905

Modified:
   people/waldi/linux-2.6/debian/rules.real
Log:
debian/rules.real: Support plain images; use k-p templates for now.


Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Sat Dec  2 14:41:18 2006
@@ -139,11 +139,8 @@
 	cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
 	touch '$@'
 
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
-	$(SETUP_DIR)
-	cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
-	touch '$@'
-
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
 	$(SETUP_DIR)
 	cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
@@ -157,10 +154,8 @@
 	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(SUBARCH) $(FLAVOUR)
 	touch '$@'
 
-$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
-	cd '$(DIR)'; $(setup_env) make $(JOBS_ARG) image
-	touch '$@'
-
+$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
+$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
 	cd '$(DIR)'; $(setup_env) make $(JOBS_ARG)
 	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(SUBARCH) $(FLAVOUR)
@@ -333,7 +328,8 @@
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): INSTALL_DIR = $(PACKAGE_DIR)/boot
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DH_OPTIONS = -p$(PACKAGE_NAME)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
 
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
@@ -349,7 +345,31 @@
 	  mv "$(BUILD_DIR)/$$i" ..;					\
 	done
 
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain:
+	dh_testdir
+	dh_testroot
+	dh_clean -d -k
+	dh_installdirs 'boot'
+	$(MAKE) -f debian/rules.real \
+	  install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_image \
+	  DIR='$(DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
+ifeq ($(MODULES),True)
+	cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR)
+	cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
+	cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
+	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}
+endif
+	$(MAKE) -f debian/rules.real \
+	  install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_templates \
+	  PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
+	$(MAKE) -f debian/rules.real install-base
+
+install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image:
+	cp '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+
+install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image:
+	cp '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
 	dh_testdir
 	dh_testroot
@@ -358,6 +378,36 @@
 	cp '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
 	$(MAKE) -f debian/rules.real install-base
 
+ifneq ($(INITRAMFS),False)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_INITRD = YES
+endif
+
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_templates:
+	install -d $(PACKAGE_DIR)/DEBIAN
+	for i in $(notdir $(wildcard debian/templates/temp.image.plain/*)); do \
+	  sed \
+	    -e 's,=D,/boot,g' \
+	    -e 's/=OF/YES/g' \
+	    -e 's/=ST/linux/g' \
+	    -e 's@=A@$(DEB_HOST_ARCH)@g' \
+	    -e 's@=B@$(KERNEL_ARCH)@g' \
+	    -e 's/=I/$(ARG_INITRD)/g' \
+	    -e 's/=L/$(BOOTLOADER)/g' \
+	    -e 's@=MK@$(INITRD_CMD)@g' \
+	    -e 's/=V/$(REAL_VERSION)/g' \
+	    -e 's/=IB//g' \
+	    -e 's/=K//g' \
+	    -e 's/=M//g' \
+	    -e 's/=MD//g' \
+	    -e 's/=R//g' \
+	    -e 's/=S//g' \
+	    '$(CURDIR)'/debian/templates/temp.image.plain/$$i > '$(PACKAGE_DIR)'/DEBIAN/$$i; \
+	done
+	chmod 755 '$(PACKAGE_DIR)'/DEBIAN/{pre,post}*
+	chmod 644 '$(PACKAGE_DIR)'/DEBIAN/templates
+
+install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_templates: BOOTLOADER = zipl
+
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)