Skip to contentSkip to conversation

Don't force deb architecture on universal packages

PATCH New Grzegorz Nosek 1 participant 1 message Mar 23, 2012 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Don't force deb architecture on universal packages

$debarch is basically always set so the Architecture field from debian/control is ignored. While we don't really care for most packages (they have Architecture: any or some specific $arch), this breaks the firmware package as it becomes an arch-dependent .deb, ignoring its
Architecture: all entry.

It's apparently broken by 10f26fa64200095af0e5d80a980e47877865e4b7.

---
Note: this is based on 3.2 as that's what I'm currently using. I'll rebase onto whatever is required when the general idea is accepted.

(earlier version was completely bogus, sorry for that)

Best regards,
Grzegorz Nosek

 scripts/package/builddeb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
scripts/package/builddeb +5 -2
index 3c6c0b1..43476c5 100644
@@ -57,8 +57,11 @@ create_package() {
 	if [ -n "$KBUILD_DEBARCH" ] ; then
 		debarch="$KBUILD_DEBARCH"
 	fi
-	if [ -n "$debarch" ] ; then
-		forcearch="-DArchitecture=$debarch"
+	if [ -n "$debarch" ]; then
+		pkgarch=`sed -n "/^Package: $pname\$/,/^\$/s/^Architecture: //p" debian/control`
+		if [ "$pkgarch" != "all" ]; then
+			forcearch="-DArchitecture=$debarch"
+		fi
 	fi
 
 	# Create the package
Signature · 1 line
1.7.2.3