[Mantic 2/6] UBUNTU: [Packaging] Remove meaningless $(header_arch)
Masahiro Yamada
masahiro.yamada at canonical.com
Fri Jul 28 13:38:13 UTC 2023
$(build_arch) and $(header_arch) are always the same.
As far as I know, there is no situation where 'make headers_install'
uses a different ARCH=.
Signed-off-by: Masahiro Yamada <masahiro.yamada at canonical.com>
---
debian.master/rules.d/amd64.mk | 1 -
debian.master/rules.d/arm64.mk | 1 -
debian.master/rules.d/armhf.mk | 1 -
debian.master/rules.d/i386.mk | 1 -
debian.master/rules.d/ppc64el.mk | 1 -
debian.master/rules.d/riscv64.mk | 1 -
debian.master/rules.d/s390x.mk | 1 -
debian.master/rules.d/x32.mk | 1 -
debian/rules.d/2-binary-arch.mk | 2 +-
9 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index afed3e50966b..a005382134aa 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -1,6 +1,5 @@
human_arch = 64 bit x86
build_arch = x86
-header_arch = $(build_arch)
defconfig = defconfig
flavours = generic
build_image = bzImage
diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk
index d215e1bda1fe..3306ccfce186 100644
--- a/debian.master/rules.d/arm64.mk
+++ b/debian.master/rules.d/arm64.mk
@@ -1,6 +1,5 @@
human_arch = ARMv8
build_arch = arm64
-header_arch = arm64
defconfig = defconfig
flavours = generic generic-64k
build_image = Image.gz
diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk
index 87abb7cc6570..3a1303c4f12a 100644
--- a/debian.master/rules.d/armhf.mk
+++ b/debian.master/rules.d/armhf.mk
@@ -1,6 +1,5 @@
human_arch = ARM (hard float)
build_arch = arm
-header_arch = arm
defconfig = defconfig
flavours = generic
build_image = zImage
diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
index c2e41a076823..a9327adb7052 100644
--- a/debian.master/rules.d/i386.mk
+++ b/debian.master/rules.d/i386.mk
@@ -1,6 +1,5 @@
human_arch = 32 bit x86
build_arch = i386
-header_arch = $(build_arch)
defconfig = defconfig
flavours = generic
build_image = bzImage
diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk
index 786e7beae016..2ceed4eaba9d 100644
--- a/debian.master/rules.d/ppc64el.mk
+++ b/debian.master/rules.d/ppc64el.mk
@@ -1,6 +1,5 @@
human_arch = PowerPC 64el
build_arch = powerpc
-header_arch = $(build_arch)
defconfig = pseries_le_defconfig
flavours = generic
build_image = vmlinux.strip
diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk
index 425537f83142..2fa468ae8c1e 100644
--- a/debian.master/rules.d/riscv64.mk
+++ b/debian.master/rules.d/riscv64.mk
@@ -1,6 +1,5 @@
human_arch = RISC-V
build_arch = riscv
-header_arch = $(build_arch)
defconfig = defconfig
flavours = generic
build_image = Image
diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk
index 4569e6e94a2e..c8675a41cd31 100644
--- a/debian.master/rules.d/s390x.mk
+++ b/debian.master/rules.d/s390x.mk
@@ -1,6 +1,5 @@
human_arch = System 390x
build_arch = s390
-header_arch = $(build_arch)
defconfig = defconfig
flavours = generic
build_image = bzImage
diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk
index 84918880e252..fc6c4179a67e 100644
--- a/debian.master/rules.d/x32.mk
+++ b/debian.master/rules.d/x32.mk
@@ -1,6 +1,5 @@
human_arch = 64 bit x86 (32 bit userspace)
build_arch = x86
-header_arch = $(build_arch)
defconfig = defconfig
flavours =
build_image = bzImage
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 182ad2afa554..1f77a787000e 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -551,7 +551,7 @@ headers_dir := $(CURDIR)/debian/linux-libc-dev
hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) \
INSTALL_HDR_PATH=$(headers_tmp)/install \
- SHELL="$(SHELL)" ARCH=$(header_arch)
+ SHELL="$(SHELL)" ARCH=$(build_arch)
.PHONY: install-arch-headers
install-arch-headers:
--
2.39.2
More information about the kernel-team
mailing list