Move generation of CONFIG_BUILD_SALT to gencontrol.py
CONFIG_DEBUG_INFO and CONFIG_MODULE_SIG are added in gencontrol.py, so be consistent with that. This unfortunately requires some ugly escaping of quotes.
This commit is contained in:
parent
c1578ede72
commit
be3a9537f5
|
@ -575,6 +575,10 @@ class Gencontrol(Base):
|
||||||
makeflags['KCONFIG_OPTIONS'] += ' -o DEBUG_INFO=y'
|
makeflags['KCONFIG_OPTIONS'] += ' -o DEBUG_INFO=y'
|
||||||
if build_signed:
|
if build_signed:
|
||||||
makeflags['KCONFIG_OPTIONS'] += ' -o MODULE_SIG=y'
|
makeflags['KCONFIG_OPTIONS'] += ' -o MODULE_SIG=y'
|
||||||
|
# Add "salt" to fix #872263
|
||||||
|
makeflags['KCONFIG_OPTIONS'] += (' -o "BUILD_SALT=\\"%s%s\\""' %
|
||||||
|
(vars['abiname'],
|
||||||
|
vars['localversion']))
|
||||||
|
|
||||||
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour "
|
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour "
|
||||||
"%s" %
|
"%s" %
|
||||||
|
|
|
@ -7,6 +7,7 @@ linux (4.19~rc7-1~exp2) UNRELEASED; urgency=medium
|
||||||
* debian/changelog: Move older entries to changelog.old
|
* debian/changelog: Move older entries to changelog.old
|
||||||
* debian/rules: Checksum only the source name and version from
|
* debian/rules: Checksum only the source name and version from
|
||||||
debian/changelog
|
debian/changelog
|
||||||
|
* Move generation of CONFIG_BUILD_SALT to gencontrol.py
|
||||||
|
|
||||||
[ Karsten Merker ]
|
[ Karsten Merker ]
|
||||||
* [riscv64] Build a kernel image and udebs for riscv64 (Closes: #908161)
|
* [riscv64] Build a kernel image and udebs for riscv64 (Closes: #908161)
|
||||||
|
|
|
@ -180,8 +180,6 @@ $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/source_$(FEA
|
||||||
rm -rf '$(DIR)'
|
rm -rf '$(DIR)'
|
||||||
mkdir '$(DIR)'
|
mkdir '$(DIR)'
|
||||||
cp '$(CONFIG)' '$(DIR)/.config'
|
cp '$(CONFIG)' '$(DIR)/.config'
|
||||||
# Add "salt" to fix #872263
|
|
||||||
echo 'CONFIG_BUILD_SALT="$(ABINAME)$(LOCALVERSION_IMAGE)"' >> '$(DIR)/.config'
|
|
||||||
echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
|
echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
|
||||||
echo 'override KERNELRELEASE = $(ABINAME)$(LOCALVERSION_IMAGE)' >> '$(DIR)/.kernelvariables'
|
echo 'override KERNELRELEASE = $(ABINAME)$(LOCALVERSION_IMAGE)' >> '$(DIR)/.kernelvariables'
|
||||||
echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
|
echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
|
||||||
|
|
Loading…
Reference in New Issue