diff --git a/debian/README.source b/debian/README.source index 67f5b2d..a9cb1ff 100644 --- a/debian/README.source +++ b/debian/README.source @@ -233,9 +233,6 @@ Several build profiles are understood and supported: - pkg.linux.mintools: Build minimal set of userland tool packages (linux-kbuild-) - pkg.linux.nokernel: Exclude kernel image and header packages -- pkg.linux.nokerneldbg: Exclude kernel debug packages -- pkg.linux.nokerneldbginfo: Build kernel without debug symbols (also disables - BTF) - pkg.linux.nosource: Exclude source binary package (linux-source-) - cross: Needed when cross-building. - nopython: Disable Python bindings. This currently disables building the diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 7d22282..79e28db 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -359,14 +359,6 @@ class Gencontrol(Base): if config.build.enable_vdso: makeflags['VDSO'] = True - packages_own.extend( - self.bundle.add('image-dbg', ruleid, makeflags, vars, arch=arch) - ) - if do_meta: - packages_own.extend( - self.bundle.add('image-dbg.meta', ruleid, makeflags, vars, arch=arch) - ) - if ( config.defs_flavour.is_default # XXX diff --git a/debian/rules.real b/debian/rules.real index 8d17893..8fc371f 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -71,8 +71,7 @@ source: $(STAMPS_DIR)/source_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG) mkdir -p '$(dir $@)' - debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS) \ - $(call if_profile, pkg.linux.nokerneldbginfo pkg.linux.quick,-o DEBUG_INFO_NONE=y -o DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=n) + debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS) define copy_source mkdir -p '$(1)' @@ -399,6 +398,7 @@ build_image: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) binary_image: DH_STRIP_ARGS = --no-automatic-dbgsym binary_image: REAL_VERSION = $(ABINAME)$(LOCALVERSION) +binary_image: SYSTEM_MAP_PATH = lib/modules/$(REAL_VERSION)/System.map.xz binary_image: INSTALL_DIR = $(DESTDIR)/boot binary_image: DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) binary_image: DIR2 = $(BUILD_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR) @@ -411,8 +411,8 @@ ifneq ($(filter arm64 armel armhf mipsel mips64el mipsr6 mipsr6el mips64r6 mips6 dh_install --sourcedir=$(DIR2) usr endif sed '/CONFIG_\(MODULE_SIG_\(ALL\|KEY\)\|SYSTEM_TRUSTED_KEYS\|BUILD_SALT\)[ =]/d' $(DIR)/.config > $(DESTDIR)/boot/config-$(REAL_VERSION) - echo "ffffffffffffffff B The real System.map is in the linux-image--dbg package" \ - > $(DESTDIR)/boot/System.map-$(REAL_VERSION) + xz -9k < $(DIR)/System.map > $(DESTDIR)/$(SYSTEM_MAP_PATH) + echo "ffffffffffffffff B The real System.map is compressed into /$(SYSTEM_MAP_PATH)" > $(DESTDIR)/boot/System.map-$(REAL_VERSION) rm $(DESTDIR)/lib/firmware -rf +$(MAKE_SELF) \ binary_image_bug \ @@ -425,62 +425,6 @@ binary_image_bug: chmod 755 $(DESTDIR)/usr/share/bug/$(PACKAGE_NAME)/script printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DEB_VENDOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\nPACKAGE_NAME='$(PACKAGE_NAME)'\nPACKAGE_VERSION='$(SOURCEVERSION)'" > $(DESTDIR)/usr/share/bug/$(PACKAGE_NAME)/info -build_image-dbg: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) - -binary_image-dbg: REAL_VERSION = $(ABINAME)$(LOCALVERSION) -binary_image-dbg: DEBUG_DIR = $(DESTDIR)/usr/lib/debug -binary_image-dbg: DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) -binary_image-dbg: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) - $(dh_binary_pre) - dh_installdirs usr/lib/debug usr/lib/debug/boot usr/share/lintian/overrides/ - install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION) - install -m644 $(DIR)/System.map $(DEBUG_DIR)/boot/System.map-$(REAL_VERSION) - -# cmd_sign=: Don't sign modules -# suffix-y=: Don't compress modules - +$(MAKE_CLEAN) -C $(DIR) modules_install \ - cmd_sign= \ - suffix-y= \ - DEPMOD='$(CURDIR)/debian/bin/no-depmod' \ - INSTALL_MOD_PATH=$(DEBUG_DIR) - -# Verify we don't have any signed modules installed - @if find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION) -name '*.ko' | xargs grep -q '~Module signature appended~'; then \ - echo; \ - echo 'Signed modules to be installed into debug package $(PACKAGE_NAME)'; \ - echo; \ - exit 1; \ - fi - -# Verify we don't have any compressed modules installed - @if ! find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION) -name '*.ko.*' -exec false {} +; then \ - echo; \ - echo 'Compressed modules to be installed into debug package $(PACKAGE_NAME)'; \ - echo; \ - exit 1; \ - fi - - find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+ - rm $(DEBUG_DIR)/lib/firmware -rf -ifeq ($(VDSO),True) - +$(MAKE_CLEAN) -C $(DIR) vdso_install INSTALL_MOD_PATH=$(DEBUG_DIR) -# Create .build-id links. Some architectures already do so, but in the -# wrong place, so delete those first. - rm -rf $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vdso/.build-id - find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vdso/ -type f | while read vdso; do \ - if buildid="$$(readelf -n "$$vdso" | sed -rne 's/^\s+Build ID: (.*)$$/\1/p')" && [ "$$buildid" ]; then \ - mkdir -p "$(DEBUG_DIR)/.build-id/$${buildid:0:2}"; \ - ln -s -r "$$vdso" "$(DEBUG_DIR)/.build-id/$${buildid:0:2}/$${buildid:2}.debug"; \ - fi; \ - done -endif -# Add symlinks to vmlinux from the locations expected by kdump-tools, -# systemtap and others - ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/ - mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION) - ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux - $(dh_binary_post) - build_source: binary_source: BUILDDEB_ARGS = -Zxz -z0 diff --git a/debian/templates/image-dbg.control.in b/debian/templates/image-dbg.control.in deleted file mode 100644 index 770403b..0000000 --- a/debian/templates/image-dbg.control.in +++ /dev/null @@ -1,9 +0,0 @@ -Package: linux-image-@abiname@@localversion@-dbg -Meta-Rules-Target: image-dbg -Build-Profiles: -Depends: ${misc:Depends} -Section: debug -Priority: optional -Description: Debug symbols for linux-image-@abiname@@localversion@ - This package provides the detached debug symbols for the Linux kernel - and modules in linux-image-@abiname@@localversion@. diff --git a/debian/templates/image-dbg.lintian-overrides.j2 b/debian/templates/image-dbg.lintian-overrides.j2 deleted file mode 100644 index 3d8e3f8..0000000 --- a/debian/templates/image-dbg.lintian-overrides.j2 +++ /dev/null @@ -1,32 +0,0 @@ -# Kernel dbg packages contain a full image with debug data -{{package}}: dbg-package-missing-depends - -# glibc doesn't seem to check for a PT_GNU_STACK section in vDSOs, so -# it's OK that they don't have it -{% if arch in ['arm64', 'armhf'] %} -{{package}}: shared-library-lacks-stack-section *usr/lib/debug/lib/modules/{{abiname}}{{localversion}}/vdso/vdso.so* -{% endif %} -{% if arch in ['amd64', 'arm64', 'ppc64el', 's390x'] %} -{{package}}: shared-library-lacks-stack-section *usr/lib/debug/lib/modules/{{abiname}}{{localversion}}/vdso/vdso32.so* -{% endif %} -{% if arch in ['amd64', 'ppc64el', 's390x'] %} -{{package}}: shared-library-lacks-stack-section *usr/lib/debug/lib/modules/{{abiname}}{{localversion}}/vdso/vdso64.so* -{% endif %} -{% if arch in ['amd64'] %} -{{package}}: shared-library-lacks-stack-section *usr/lib/debug/lib/modules/{{abiname}}{{localversion}}/vdso/vdsox32.so* -{% endif %} - -# It is intended that 64-bit kernels provide vDSOs for 32-bit executables. -# lintian currently allows i386 executables on amd64. -{% if arch in ['arm64', 'ppc64el', 's390x'] %} -{{package}}: binary-from-other-architecture *usr/lib/debug/lib/modules/{{abiname}}{{localversion}}/vdso/vdso32.so* -{% endif %} -{% if arch in ['amd64'] %} -{{package}}: binary-from-other-architecture *usr/lib/debug/lib/modules/{{abiname}}{{localversion}}/vdso/vdsox32.so* -{% endif %} - -# Some 32-bit architectures need 64-bit kernels and we still build -# these as the "wrong" architecture rather than mandating multiarch. -{% if arch in ['hppa', 'mips', 'mipsel', 'powerpc'] %} -{{package}}: binary-from-other-architecture *usr/lib/debug/* -{% endif %} diff --git a/debian/templates/image-dbg.meta.control.in b/debian/templates/image-dbg.meta.control.in deleted file mode 100644 index 1185f22..0000000 --- a/debian/templates/image-dbg.meta.control.in +++ /dev/null @@ -1,9 +0,0 @@ -Package: linux-image@source_suffix@@localversion@-dbg -Meta-Rules-Target: meta -Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=linux-image-@abiname@@localversion@-dbg -Build-Profiles: -Depends: linux-image-@abiname@@localversion@-dbg (= ${binary:Version}), ${misc:Depends} -Provides: linux-latest-image-dbg -Description: Debugging symbols for Linux @flavour@ configuration (meta-package) - This package depends on the detached debugging symbols for the latest - Linux kernel @flavour@ configuration. diff --git a/debian/templates/image-dbg.meta.lintian-overrides.in b/debian/templates/image-dbg.meta.lintian-overrides.in deleted file mode 100644 index aef9e32..0000000 --- a/debian/templates/image-dbg.meta.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -@package@: wrong-section-according-to-package-name linux-image@source_suffix@-@flavour@-dbg => debug diff --git a/debian/templates/image-dbg.meta.maintscript.in b/debian/templates/image-dbg.meta.maintscript.in deleted file mode 100644 index cd8078c..0000000 --- a/debian/templates/image-dbg.meta.maintscript.in +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/@package@ linux-image-@abiname@@localversion@-dbg 5.7~rc5-1~exp1 @package@