r3861: waldi | 2005-08-14 20:06:22 +0000

debian/rules: Move stamp files.

r3868: waldi | 2005-08-15 08:50:33 +0000
debian/rules: Make the arch defines file prequisites of debian/control.

r3869: waldi | 2005-08-15 08:51:39 +0000
debian/templates/control.extra.in: Add transition packages for powerpc64 images.

svn path=/trunk/kernel/source/linux-2.6/; revision=3870

2 files changed, 81 insertions, 7 deletions

diff --git a/debian/rules b/debian/rules
index 85f602a5c92d..0b01d8c8a3c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,14 @@ MAJOR    := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
 
 include debian/rules.defs
 
-setup: debian/setup-stamp
-debian/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR)
+setup: $(STAMPS_DIR)/setup-stamp
+$(STAMPS_DIR)/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir
 	$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
 	touch $@
 
-build: debian/control debian/build-stamp
-debian/build-stamp: $(BUILD_DIR) $(STAMPS_DIR) debian/setup-stamp
+build: debian/control $(STAMPS_DIR)/build-stamp
+$(STAMPS_DIR)/build-stamp: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup-stamp
 	dh_testdir
 	$(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
 	touch $@
@@ -59,7 +59,9 @@ binary:	binary-indep binary-arch
 # Makes the master debian/control file by substituting
 # variable values into the template.
 #
-debian/control debian/rules.gen: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
+CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) 
+CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
+debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
 	if [ -f debian/control.md5sum ]; then \
 		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
 			$(MAKE) -f debian/rules debian/control-real; \
@@ -68,8 +70,8 @@ debian/control debian/rules.gen: debian/bin/gencontrol.py debian/changelog $(wil
 		$(MAKE) -f debian/rules debian/control-real; \
 	fi
 
-debian/control-real: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
-	debian/bin/gencontrol.py
+debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES)
+	$<
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index de2f9b7bdbc8..2487eb7c7b51 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -97,6 +97,78 @@ Depends: linux-image-2.6-powerpc-smp
 Description: Linux kernel 2.6 image on powerpc-smp-class machines - transition package
  This package is for transition only.
 
+Package: kernel-image-power3
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-powerpc64
+Description: linux kernel image on power3 - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-power3
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-powerpc64
+Description: linux kernel 2.6 image on power3 - transition package
+ This package is for transition only.
+
+Package: kernel-image-power3-smp
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-powerpc64
+Description: linux kernel image on power3 - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-power3-smp
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-powerpc64
+Description: linux kernel 2.6 image on power3 - transition package
+ This package is for transition only.
+
+Package: kernel-image-power4
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-powerpc64
+Description: linux kernel image on power4/G5 - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-power4
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-powerpc64
+Description: linux kernel 2.6 image on power4/G5 - transition package
+ This package is for transition only.
+
+Package: kernel-image-power4-smp
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-powerpc64
+Description: linux kernel image on power4/G5 - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-power4-smp
+X-Version-Overwrite-Epoch: 1
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-powerpc64
+Description: linux kernel 2.6 image on SMP power4/G5 - transition package
+ This package is for transition only.
+
 Package: kernel-image-2.6-s390
 Architecture: s390
 Section: base