[Glibc-bsd-commits] r3827 - trunk/kfreebsd-10/debian

[Robert Millan]

Author: rmh
Date: 2011-11-06 12:32:39 +0000 (Sun, 06 Nov 2011)
New Revision: 3827

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Fix i386 udeb flavor (should be -486, not -xen).

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2011-11-06 12:00:23 UTC (rev 3826)
+++ trunk/kfreebsd-10/debian/changelog	2011-11-06 12:32:39 UTC (rev 3827)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn227111-2) experimental; urgency=low
+
+  * Fix i386 udeb flavor (should be -486, not -xen).
+
+ -- Robert Millan <rmh at debian.org>  Sun, 06 Nov 2011 12:45:28 +0100
+
 kfreebsd-10 (10.0~svn227111-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2011-11-06 12:00:23 UTC (rev 3826)
+++ trunk/kfreebsd-10/debian/rules	2011-11-06 12:32:39 UTC (rev 3827)
@@ -56,11 +56,22 @@
 	rm -rf $(ORIG_DIR)
 
 control: clean
+	for arch in `ls $(CURDIR)/debian/arch/` ; do \
+		KW_CONFIG_DIR=debian/arch/$$arch/installer ; \
+		if test -e $$KW_CONFIG_DIR ; then \
+			for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
+				flavor=$${config/.config/} ; \
+				if test -e debian/arch/$$arch/$$flavor.installer ; then \
+					echo "kfreebsd-$$arch $(version)-$(abiname) $$flavor $(version)-$(abiname)-$$flavor - -" ; \
+				fi ; \
+			done > $$KW_CONFIG_DIR/kernel-versions ; \
+		fi ; \
+		echo ; \
+	done
 	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@gcc_version@/$(gcc_version)/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
 	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \
-		export KW_CONFIG_DIR=debian/arch/$$arch/installer ; \
 		for config in `ls $(CURDIR)/debian/arch/$$arch/ | grep \.config` ; do \
 			flavor=$${config/.config/} ; \
 			recommends= ; \
@@ -68,12 +79,9 @@
 			sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/$$arch/g" -e "s/@recommends@/$$recommends/g" \
 				$(CURDIR)/debian/control.flavor.in ; \
 			echo ; \
-			if test -e $$KW_CONFIG_DIR ; then \
-				echo "kfreebsd-$$arch $(version)-$(abiname) $$flavor $(version)-$(abiname)-$$flavor - -" \
-					> $$KW_CONFIG_DIR/kernel-versions ; \
-			fi ; \
 		done ; \
-		if test -e $$KW_CONFIG_DIR ; then \
+		export KW_CONFIG_DIR=debian/arch/$$arch/installer ; \
+		if test -e $$KW_CONFIG_DIR/kernel-versions ; then \
 			kernel-wedge gen-control ; \
 		fi ; \
 		echo ; \