[Concept,1/2] debian: Drop the uboot.elf target from qemu builds
Commit Message
From: Simon Glass <sjg@chromium.org>
The stripped ELF copy of u-boot is not needed in the package. Drop it
from all qemu platform targets, remove the copy/strip logic from rules
and the associated lintian overrides.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
debian/rules | 6 ------
debian/targets.mk | 16 ++++++++--------
debian/u-boot-concept-qemu.lintian-overrides | 8 +-------
3 files changed, 9 insertions(+), 21 deletions(-)
@@ -71,12 +71,6 @@ define build_template
CROSS_COMPILE=$(or $($(platform)_CROSS_COMPILE),$(CROSS_COMPILE)) \
$($(platform)_assigns)
- ifneq (,$(filter uboot.elf,$($(platform)_targets)))
- cp -u debian/build/$(platform)/u-boot debian/build/$(platform)/uboot.elf
- # Strip the ELF binary
- $($(platform)_CROSS_COMPILE)strip --remove-section=.comment --remove-section=.note \
- debian/build/$(platform)/uboot.elf
- endif
# Upstream generates executable targets (last checked with 2020-10).
chmod -x $(addprefix debian/build/$(platform)/,$($(platform)_targets))
@@ -5,35 +5,35 @@
u-boot-concept-qemu_platforms += qemu-ppce500
qemu-ppce500_CROSS_COMPILE := powerpc-linux-gnu-
- qemu-ppce500_targets := u-boot.bin uboot.elf
+ qemu-ppce500_targets := u-boot.bin
u-boot-concept-qemu_platforms += qemu-riscv64
qemu-riscv64_CROSS_COMPILE := riscv64-linux-gnu-
- qemu-riscv64_targets := u-boot.bin uboot.elf
+ qemu-riscv64_targets := u-boot.bin
u-boot-concept-qemu_platforms += qemu-riscv64_smode
qemu-riscv64_smode_CROSS_COMPILE := riscv64-linux-gnu-
- qemu-riscv64_smode_targets := u-boot.bin uboot.elf
+ qemu-riscv64_smode_targets := u-boot.bin
u-boot-concept-qemu_platforms += qemu-x86
qemu-x86_CROSS_COMPILE := i686-linux-gnu-
- qemu-x86_targets := u-boot.bin u-boot.rom uboot.elf
+ qemu-x86_targets := u-boot.bin u-boot.rom
u-boot-concept-qemu_platforms += qemu-x86_64
qemu-x86_64_CROSS_COMPILE := x86_64-linux-gnu-
- qemu-x86_64_targets := u-boot.bin u-boot.rom uboot.elf
+ qemu-x86_64_targets := u-boot.bin u-boot.rom
u-boot-concept-qemu_platforms += qemu-x86_64_nospl
qemu-x86_64_nospl_CROSS_COMPILE := x86_64-linux-gnu-
- qemu-x86_64_nospl_targets := u-boot.bin u-boot.rom uboot.elf
+ qemu-x86_64_nospl_targets := u-boot.bin u-boot.rom
u-boot-concept-qemu_platforms += qemu_arm
qemu_arm_CROSS_COMPILE := arm-linux-gnueabihf-
- qemu_arm_targets := u-boot.bin uboot.elf
+ qemu_arm_targets := u-boot.bin
u-boot-concept-qemu_platforms += qemu_arm64
qemu_arm64_CROSS_COMPILE := aarch64-linux-gnu-
- qemu_arm64_targets := u-boot.bin uboot.elf
+ qemu_arm64_targets := u-boot.bin
# u-boot-concept-efi (Architecture: all)
@@ -1,10 +1,4 @@
-# These bootloaders need to be statically linked.
-u-boot-concept-qemu binary: statically-linked-binary [*usr/lib/u-boot-concept/*/uboot.elf*]
-
-# These are bootloader binaries, and have no external dependency information
-u-boot-concept-qemu binary: shared-library-lacks-prerequisites [*usr/lib/u-boot-concept/*/uboot.elf*]
-
u-boot-concept-qemu: description-synopsis-starts-with-article
# These are binary firmware blobs
-u-boot-concept-qemu binary: arch-independent-package-contains-binary-or-object [*usr/lib/u-boot-concept/*/uboot.elf*]
+u-boot-concept-qemu binary: arch-independent-package-contains-binary-or-object [*usr/lib/u-boot-concept/*]