Skip to content

Commit 9edd2d2

Browse files
vvolandvvoland
committed
debian: build armhf as ARMv6+hf only for Raspbian
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent 52dadc3 commit 9edd2d2

File tree

7 files changed

+21
-43
lines changed

7 files changed

+21
-43
lines changed

‎pkg/buildx/deb/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/make -f
22

3-
# Include default Makefile variables.
4-
include /usr/share/dpkg/default.mk
5-
6-
# Build all armhf binaries as ARMv6 with hard float, to support both
7-
# Debian armhf and Raspbian armhf.
8-
ifeq ($(DEB_TARGET_ARCH),armhf)
3+
# Build Raspbian armhf binaries as ARMv6 with hard float.
4+
include /usr/share/dpkg/vendor.mk
5+
ifeq ($(DEB_VENDOR),Raspbian)
96
export CFLAGS += -marm -march=armv6+fp
107
export GOARM := 6
118
endif

‎pkg/compose/deb/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/make -f
22

3-
# Include default Makefile variables.
4-
include /usr/share/dpkg/default.mk
5-
6-
# Build all armhf binaries as ARMv6 with hard float, to support both
7-
# Debian armhf and Raspbian armhf.
8-
ifeq ($(DEB_TARGET_ARCH),armhf)
3+
# Build Raspbian armhf binaries as ARMv6 with hard float.
4+
include /usr/share/dpkg/vendor.mk
5+
ifeq ($(DEB_VENDOR),Raspbian)
96
export CFLAGS += -marm -march=armv6+fp
107
export GOARM := 6
118
endif

‎pkg/containerd/deb/rules‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
18-
# Include default Makefile variables.
19-
include /usr/share/dpkg/default.mk
20-
21-
# Build all armhf binaries as ARMv6 with hard float, to support both
22-
# Debian armhf and Raspbian armhf.
23-
ifeq ($(DEB_TARGET_ARCH),armhf)
17+
# Build Raspbian armhf binaries as ARMv6 with hard float.
18+
include /usr/share/dpkg/vendor.mk
19+
ifeq ($(DEB_VENDOR),Raspbian)
2420
export CFLAGS += -marm -march=armv6+fp
2521
export GOARM := 6
2622
endif

‎pkg/credential-helpers/deb/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/make -f
22

3-
# Include default Makefile variables.
4-
include /usr/share/dpkg/default.mk
5-
6-
# Build all armhf binaries as ARMv6 with hard float, to support both
7-
# Debian armhf and Raspbian armhf.
8-
ifeq ($(DEB_TARGET_ARCH),armhf)
3+
# Build Raspbian armhf binaries as ARMv6 with hard float.
4+
include /usr/share/dpkg/vendor.mk
5+
ifeq ($(DEB_VENDOR),Raspbian)
96
export CFLAGS += -marm -march=armv6+fp
107
export GOARM := 6
118
endif

‎pkg/docker-cli/deb/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/make -f
22

3-
# Include default Makefile variables.
4-
include /usr/share/dpkg/default.mk
5-
6-
# Build all armhf binaries as ARMv6 with hard float, to support both
7-
# Debian armhf and Raspbian armhf.
8-
ifeq ($(DEB_TARGET_ARCH),armhf)
3+
# Build Raspbian armhf binaries as ARMv6 with hard float.
4+
include /usr/share/dpkg/vendor.mk
5+
ifeq ($(DEB_VENDOR),Raspbian)
96
export CFLAGS += -marm -march=armv6+fp
107
export GOARM := 6
118
endif

‎pkg/docker-engine/deb/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/make -f
22

3-
# Include default Makefile variables.
4-
include /usr/share/dpkg/default.mk
5-
6-
# Build all armhf binaries as ARMv6 with hard float, to support both
7-
# Debian armhf and Raspbian armhf.
8-
ifeq ($(DEB_TARGET_ARCH),armhf)
3+
# Build Raspbian armhf binaries as ARMv6 with hard float.
4+
include /usr/share/dpkg/vendor.mk
5+
ifeq ($(DEB_VENDOR),Raspbian)
96
export CFLAGS += -marm -march=armv6+fp
107
export GOARM := 6
118
endif

‎pkg/model/deb/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/make -f
22

3-
# Include default Makefile variables.
4-
include /usr/share/dpkg/default.mk
5-
6-
# Build all armhf binaries as ARMv6 with hard float, to support both
7-
# Debian armhf and Raspbian armhf.
8-
ifeq ($(DEB_TARGET_ARCH),armhf)
3+
# Build Raspbian armhf binaries as ARMv6 with hard float.
4+
include /usr/share/dpkg/vendor.mk
5+
ifeq ($(DEB_VENDOR),Raspbian)
96
export CFLAGS += -marm -march=armv6+fp
107
export GOARM := 6
118
endif

0 commit comments

Comments
 (0)