Commit 6eabebb1 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: deb-pkg: hide KDEB_SOURCENAME from Makefile 



scripts/Makefile.package does not need to know the value of
KDEB_SOURCENAME because the source name can be taken from
debian/changelog by using dpkg-parsechangelog.

Move the default of KDEB_SOURCENAME (i.e. linux-upstream) to
scripts/package/mkdebian.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNicolas Schier <nicolas@fjasle.eu>
parent 6fc91752

scripts/Makefile.package

+15 −8
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ 
include $(srctree)/scripts/Kbuild.include



KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))

KDEB_SOURCENAME ?= linux-upstream

KBUILD_PKG_ROOTCMD ?="fakeroot -u"

export KDEB_SOURCENAME

# Include only those top-level files that are needed by make, plus the GPL copy

TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \

               include init io_uring ipc kernel lib mm net rust \
@@ -87,17 +85,26 @@ binrpm-pkg: 
	+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \

		$(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec



quiet_cmd_debianize = GEN     $@

      cmd_debianize = $(srctree)/scripts/package/mkdebian



debian: FORCE

	$(call cmd,debianize)



PHONY += debian-orig

debian-orig: private source = $(shell dpkg-parsechangelog -S Source)

debian-orig: private version = $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*$$//')

debian-orig: private orig-name = $(source)_$(version).orig.tar.gz

debian-orig: linux.tar.gz debian

	$(Q)cp $< ../$(orig-name)



PHONY += deb-pkg

deb-pkg: linux.tar.gz

	$(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian

	origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\

		cp linux.tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz

deb-pkg: debian-orig

	+dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \

		--build=source,binary --source-option=-sP -nc -us -uc



PHONY += bindeb-pkg

bindeb-pkg:

	$(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian

bindeb-pkg: debian

	+dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc



PHONY += intdeb-pkg

scripts/package/mkdebian

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ else 
	revision=$($srctree/init/build-version)

	packageversion=$version-$revision

fi

sourcename=$KDEB_SOURCENAME

sourcename=${KDEB_SOURCENAME:-linux-upstream}



if [ "$ARCH" = "um" ] ; then

	packagename=user-mode-linux