c/pve-kernel-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefile: convert to use simple parenthesis

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-05-20 16:28:20 +02:00
parent b2e4b7ebcb
commit 8fbdb63a27
1 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
Makefile
View File

@ -11,18 +11,18 @@ PKGREL=2
KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN) KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL) KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
EXTRAVERSION=-${KREL}-pve EXTRAVERSION=-$(KREL)-pve
KVNAME=${KERNEL_VER}${EXTRAVERSION} KVNAME=$(KERNEL_VER)$(EXTRAVERSION)
PACKAGE=pve-kernel-${KVNAME} PACKAGE=pve-kernel-$(KVNAME)
HDRPACKAGE=pve-headers-${KVNAME} HDRPACKAGE=pve-headers-$(KVNAME)
ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH) ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
# amd64/x86_64/x86 share the arch subdirectory in the kernel, 'x86' so we need # amd64/x86_64/x86 share the arch subdirectory in the kernel, 'x86' so we need
# a mapping # a mapping
KERNEL_ARCH=x86 KERNEL_ARCH=x86
ifneq (${ARCH}, amd64) ifneq ($(ARCH), amd64)
KERNEL_ARCH=${ARCH} KERNEL_ARCH=$(ARCH)
endif endif
GITVERSION:=$(shell git rev-parse HEAD) GITVERSION:=$(shell git rev-parse HEAD)
@ -33,78 +33,78 @@ BUILD_DIR=build
KERNEL_SRC=ubuntu-kernel KERNEL_SRC=ubuntu-kernel
KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC) KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
KERNEL_CFG_ORG=config-${KERNEL_VER}.org KERNEL_CFG_ORG=config-$(KERNEL_VER).org
ZFSONLINUX_SUBMODULE=submodules/zfsonlinux ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
ZFSDIR=pkg-zfs ZFSDIR=pkg-zfs
MODULES=modules MODULES=modules
MODULE_DIRS=${ZFSDIR} MODULE_DIRS=$(ZFSDIR)
# exported to debian/rules via debian/rules.d/dirs.mk # exported to debian/rules via debian/rules.d/dirs.mk
DIRS=KERNEL_SRC ZFSDIR MODULES DIRS=KERNEL_SRC ZFSDIR MODULES
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb DST_DEB=$(PACKAGE)_$(KERNEL_VER)-$(PKGREL)_$(ARCH).deb
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb HDR_DEB=$(HDRPACKAGE)_$(KERNEL_VER)-$(PKGREL)_$(ARCH).deb
USR_HDR_DEB=pve-kernel-libc-dev_${KERNEL_VER}-${PKGREL}_${ARCH}.deb USR_HDR_DEB=pve-kernel-libc-dev_$(KERNEL_VER)-$(PKGREL)_$(ARCH).deb
LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(PKGREL)_$(ARCH).deb
LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_${KERNEL_VER}-${PKGREL}_${ARCH}.deb LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_$(KERNEL_VER)-$(PKGREL)_$(ARCH).deb
DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB} ${LINUX_TOOLS_DBG_DEB} # ${USR_HDR_DEB} DEBS=$(DST_DEB) $(HDR_DEB) $(LINUX_TOOLS_DEB) $(LINUX_TOOLS_DBG_DEB) # $(USR_HDR_DEB)
all: deb all: deb
deb: ${DEBS} deb: $(DEBS)
${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB} $(LINUX_TOOLS_DEB) $(HDR_DEB): $(DST_DEB)
${DST_DEB}: ${BUILD_DIR}.prepared $(DST_DEB): $(BUILD_DIR).prepared
cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us cd $(BUILD_DIR); dpkg-buildpackage --jobs=auto -b -uc -us
lintian ${DST_DEB} lintian $(DST_DEB)
#lintian ${HDR_DEB} #lintian $(HDR_DEB)
lintian ${LINUX_TOOLS_DEB} lintian $(LINUX_TOOLS_DEB)
${BUILD_DIR}.prepared: $(addsuffix .prepared,${KERNEL_SRC} ${MODULES} debian) $(BUILD_DIR).prepared: $(addsuffix .prepared,$(KERNEL_SRC) $(MODULES) debian)
cp -a fwlist-previous ${BUILD_DIR}/ cp -a fwlist-previous $(BUILD_DIR)/
cp -a abi-prev-* ${BUILD_DIR}/ cp -a abi-prev-* $(BUILD_DIR)/
cp -a abi-blacklist ${BUILD_DIR}/ cp -a abi-blacklist $(BUILD_DIR)/
touch $@ touch $@
debian.prepared: debian debian.prepared: debian
rm -rf ${BUILD_DIR}/debian rm -rf $(BUILD_DIR)/debian
mkdir -p ${BUILD_DIR} mkdir -p $(BUILD_DIR)
cp -a debian ${BUILD_DIR}/debian cp -a debian $(BUILD_DIR)/debian
echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout $(GITVERSION)" > $(BUILD_DIR)/debian/SOURCE
@$(foreach dir, ${DIRS},echo "${dir}=${${dir}}" >> ${BUILD_DIR}/debian/rules.d/env.mk;) @$(foreach dir, $(DIRS),echo "$(dir)=$($(dir))" >> $(BUILD_DIR)/debian/rules.d/env.mk;)
echo "KVNAME=${KVNAME}" >> ${BUILD_DIR}/debian/rules.d/env.mk echo "KVNAME=$(KVNAME)" >> $(BUILD_DIR)/debian/rules.d/env.mk
echo "KERNEL_MAJMIN=${KERNEL_MAJMIN}" >> ${BUILD_DIR}/debian/rules.d/env.mk echo "KERNEL_MAJMIN=$(KERNEL_MAJMIN)" >> $(BUILD_DIR)/debian/rules.d/env.mk
cd ${BUILD_DIR}; debian/rules debian/control cd $(BUILD_DIR); debian/rules debian/control
touch $@ touch $@
${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule $(KERNEL_SRC).prepared: $(KERNEL_SRC_SUBMODULE) | submodule
rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@ rm -rf $(BUILD_DIR)/$(KERNEL_SRC) $@
mkdir -p ${BUILD_DIR} mkdir -p $(BUILD_DIR)
cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC} cp -a $(KERNEL_SRC_SUBMODULE) $(BUILD_DIR)/$(KERNEL_SRC)
# TODO: split for archs, track and diff in our repository? # TODO: split for archs, track and diff in our repository?
cd ${BUILD_DIR}/${KERNEL_SRC}; python3 debian/scripts/misc/annotations --arch amd64 --export >../../${KERNEL_CFG_ORG} cd $(BUILD_DIR)/$(KERNEL_SRC); python3 debian/scripts/misc/annotations --arch amd64 --export >../../$(KERNEL_CFG_ORG)
cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config cp $(KERNEL_CFG_ORG) $(BUILD_DIR)/$(KERNEL_SRC)/.config
sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' sed -i $(BUILD_DIR)/$(KERNEL_SRC)/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=$(EXTRAVERSION)/'
rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian ${BUILD_DIR}/${KERNEL_SRC}/debian.master rm -rf $(BUILD_DIR)/$(KERNEL_SRC)/debian $(BUILD_DIR)/$(KERNEL_SRC)/debian.master
set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done set -e; cd $(BUILD_DIR)/$(KERNEL_SRC); for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
touch $@ touch $@
${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS}) $(MODULES).prepared: $(addsuffix .prepared,$(MODULE_DIRS))
touch $@ touch $@
${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE} $(ZFSDIR).prepared: $(ZFSONLINUX_SUBMODULE)
rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@ rm -rf $(BUILD_DIR)/$(MODULES)/$(ZFSDIR) $(BUILD_DIR)/$(MODULES)/tmp $@
mkdir -p ${BUILD_DIR}/${MODULES}/tmp mkdir -p $(BUILD_DIR)/$(MODULES)/tmp
cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp cp -a $(ZFSONLINUX_SUBMODULE)/* $(BUILD_DIR)/$(MODULES)/tmp
cd ${BUILD_DIR}/${MODULES}/tmp; make kernel cd $(BUILD_DIR)/$(MODULES)/tmp; make kernel
rm -rf ${BUILD_DIR}/${MODULES}/tmp rm -rf $(BUILD_DIR)/$(MODULES)/tmp
touch ${ZFSDIR}.prepared touch $(ZFSDIR).prepared
.PHONY: upload .PHONY: upload
upload: ${DEBS} upload: $(DEBS)
tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch ${ARCH} tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch $(ARCH)
.PHONY: distclean .PHONY: distclean
distclean: clean distclean: clean
@ -114,18 +114,18 @@ distclean: clean
.PHONY: update_modules .PHONY: update_modules
update_modules: submodule update_modules: submodule
git submodule foreach 'git pull --ff-only origin master' git submodule foreach 'git pull --ff-only origin master'
cd ${ZFSONLINUX_SUBMODULE}; git pull --ff-only origin master cd $(ZFSONLINUX_SUBMODULE); git pull --ff-only origin master
# make sure submodules were initialized # make sure submodules were initialized
.PHONY: submodule .PHONY: submodule
submodule: submodule:
test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE} test -f "$(KERNEL_SRC_SUBMODULE)/README" || git submodule update --init $(KERNEL_SRC_SUBMODULE)
test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init --recursive ${ZFSONLINUX_SUBMODULE} test -f "$(ZFSONLINUX_SUBMODULE)/Makefile" || git submodule update --init --recursive $(ZFSONLINUX_SUBMODULE)
# call after ABI bump with header deb in working directory # call after ABI bump with header deb in working directory
.PHONY: abiupdate .PHONY: abiupdate
abiupdate: abi-prev-${KVNAME} abiupdate: abi-prev-$(KVNAME)
abi-prev-${KVNAME}: abi-tmp-${KVNAME} abi-prev-$(KVNAME): abi-tmp-$(KVNAME)
ifneq ($(strip $(shell git status --untracked-files=no --porcelain -z)),) ifneq ($(strip $(shell git status --untracked-files=no --porcelain -z)),)
@echo "working directory unclean, aborting!" @echo "working directory unclean, aborting!"
@false @false
@ -133,15 +133,15 @@ else
git rm "abi-prev-*" git rm "abi-prev-*"
mv $< $@ mv $< $@
git add $@ git add $@
git commit -s -m "update ABI file for ${KVNAME}" -m "(generated with debian/scripts/abi-generate)" git commit -s -m "update ABI file for $(KVNAME)" -m "(generated with debian/scripts/abi-generate)"
@echo "update abi-prev-${KVNAME} committed!" @echo "update abi-prev-$(KVNAME) committed!"
endif endif
abi-tmp-${KVNAME}: abi-tmp-$(KVNAME):
@ test -e ${HDR_DEB} || (echo "need ${HDR_DEB} to extract ABI data!" && false) @ test -e $(HDR_DEB) || (echo "need $(HDR_DEB) to extract ABI data!" && false)
debian/scripts/abi-generate ${HDR_DEB} $@ ${KVNAME} 1 debian/scripts/abi-generate $(HDR_DEB) $@ $(KVNAME) 1
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf *~ build *.prepared ${KERNEL_CFG_ORG} rm -rf *~ build *.prepared $(KERNEL_CFG_ORG)
rm -f *.deb *.changes *.buildinfo rm -f *.deb *.changes *.buildinfo