debian: build armhf as ARMv6+hf only for Raspbian

vvoland · vvoland · commit 564d2c6865fa · 2025-10-02T12:41:23.000+02:00
Signed-off-by: Paweł Gronowski &lt;pawel.gronowski@docker.com&gt;
diff --git a/pkg/buildx/deb/rules b/pkg/buildx/deb/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Include default Makefile variables.
+# Build Raspbian armhf binaries as ARMv6 with hard float.
 include /usr/share/dpkg/default.mk
-
-# Build all armhf binaries as ARMv6 with hard float, to support both
-# Debian armhf and Raspbian armhf.
 ifeq ($(DEB_TARGET_ARCH),armhf)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
diff --git a/pkg/compose/deb/rules b/pkg/compose/deb/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Include default Makefile variables.
+# Build Raspbian armhf binaries as ARMv6 with hard float.
 include /usr/share/dpkg/default.mk
-
-# Build all armhf binaries as ARMv6 with hard float, to support both
-# Debian armhf and Raspbian armhf.
 ifeq ($(DEB_TARGET_ARCH),armhf)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
diff --git a/pkg/containerd/deb/rules b/pkg/containerd/deb/rules
@@ -14,12 +14,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
-# Include default Makefile variables.
+# Build Raspbian armhf binaries as ARMv6 with hard float.
 include /usr/share/dpkg/default.mk
-
-# Build all armhf binaries as ARMv6 with hard float, to support both
-# Debian armhf and Raspbian armhf.
 ifeq ($(DEB_TARGET_ARCH),armhf)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
diff --git a/pkg/credential-helpers/deb/rules b/pkg/credential-helpers/deb/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Include default Makefile variables.
+# Build Raspbian armhf binaries as ARMv6 with hard float.
 include /usr/share/dpkg/default.mk
-
-# Build all armhf binaries as ARMv6 with hard float, to support both
-# Debian armhf and Raspbian armhf.
 ifeq ($(DEB_TARGET_ARCH),armhf)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
diff --git a/pkg/docker-cli/deb/rules b/pkg/docker-cli/deb/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Include default Makefile variables.
+# Build Raspbian armhf binaries as ARMv6 with hard float.
 include /usr/share/dpkg/default.mk
-
-# Build all armhf binaries as ARMv6 with hard float, to support both
-# Debian armhf and Raspbian armhf.
 ifeq ($(DEB_TARGET_ARCH),armhf)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
diff --git a/pkg/docker-engine/deb/rules b/pkg/docker-engine/deb/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-# Include default Makefile variables.
+# Build Raspbian armhf binaries as ARMv6 with hard float.
 include /usr/share/dpkg/default.mk
-
-# Build all armhf binaries as ARMv6 with hard float, to support both
-# Debian armhf and Raspbian armhf.
 ifeq ($(DEB_TARGET_ARCH),armhf)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
diff --git a/pkg/model/deb/rules b/pkg/model/deb/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
-# Include default Makefile variables.
-include /usr/share/dpkg/default.mk
-
 # Build all armhf binaries as ARMv6 with hard float, to support both
 # Debian armhf and Raspbian armhf.
-ifeq ($(DEB_TARGET_ARCH),armhf)
+include /usr/share/dpkg/vendor.mk
+ifeq ($(DEB_VENDOR),Raspbian)
 	export CFLAGS += -marm -march=armv6+fp
 	export GOARM := 6
 endif
