From 1995e62236120ea5dbf85bcb08e16ebd036f987b Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 20 May 2023 19:50:28 +0200 Subject: [PATCH] makefile: convert to use simple parenthesis Signed-off-by: Thomas Lamprecht --- Makefile | 98 +++++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 8c0461b..a86644a 100644 --- a/Makefile +++ b/Makefile @@ -1,82 +1,80 @@ +include /usr/share/dpkg/default.mk # source form https://github.com/zfsonlinux/ -ZFSPKG=debian -ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1 -ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion -ZFSDIR=zfs-linux_${ZFSVER} +ZFSDIR=zfs-linux_$(DEB_VERSION_UPSTREAM) ZFSSRC=upstream -ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb +ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb ZFS_DEB_BINARY = \ -libpam-zfs_${ZFSPKGVER}_amd64.deb \ -libuutil3linux_${ZFSPKGVER}_amd64.deb \ -libzfs4linux_${ZFSPKGVER}_amd64.deb \ -libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \ -libzpool5linux_${ZFSPKGVER}_amd64.deb \ -zfs-test_${ZFSPKGVER}_amd64.deb \ -zfsutils-linux_${ZFSPKGVER}_amd64.deb \ -zfs-zed_${ZFSPKGVER}_amd64.deb - -ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY}) - -ZFS_DEB2= ${ZFS_DEB_BINARY} \ -libzfslinux-dev_${ZFSPKGVER}_amd64.deb \ -python3-pyzfs_${ZFSPKGVER}_amd64.deb \ -pyzfs-doc_${ZFSPKGVER}_all.deb \ -spl_${ZFSPKGVER}_all.deb \ -zfs-initramfs_${ZFSPKGVER}_all.deb -DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS} - -ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc +libpam-zfs_$(DEB_VERSION)_amd64.deb \ +libuutil3linux_$(DEB_VERSION)_amd64.deb \ +libzfs4linux_$(DEB_VERSION)_amd64.deb \ +libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb \ +libzpool5linux_$(DEB_VERSION)_amd64.deb \ +zfs-test_$(DEB_VERSION)_amd64.deb \ +zfsutils-linux_$(DEB_VERSION)_amd64.deb \ +zfs-zed_$(DEB_VERSION)_amd64.deb + +ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY)) + +ZFS_DEB2= $(ZFS_DEB_BINARY) \ +libzfslinux-dev_$(DEB_VERSION)_amd64.deb \ +python3-pyzfs_$(DEB_VERSION)_amd64.deb \ +pyzfs-doc_$(DEB_VERSION)_all.deb \ +spl_$(DEB_VERSION)_all.deb \ +zfs-initramfs_$(DEB_VERSION)_all.deb +DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS) + +ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc all: deb .PHONY: deb -deb: ${DEBS} +deb: $(DEBS) .PHONY: dsc -dsc: ${ZFS_DSC} +dsc: $(ZFS_DSC) # called from pve-kernel's Makefile to get patched sources .PHONY: kernel kernel: $(ZFS_DSC) - dpkg-source -x ${ZFS_DSC} ../pkg-zfs - ${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file + dpkg-source -x $(ZFS_DSC) ../pkg-zfs + $(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file .PHONY: dinstall -dinstall: ${DEBS} - dpkg -i ${DEBS} +dinstall: $(DEBS) + dpkg -i $(DEBS) .PHONY: submodule submodule: - test -f "${ZFSSRC}/README.md" || git submodule update --init -${ZFSSRC}/README.md: submodule + test -f "$(ZFSSRC)/README.md" || git submodule update --init +$(ZFSSRC)/README.md: submodule .PHONY: zfs -zfs: ${DEBS} -${ZFS_DEB2} ${ZFS_DBG_DEBS}: ${ZFS_DEB1} -${ZFS_DEB1}: ${ZFSDIR} - cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us - lintian ${DEBS} - -${ZFS_DSC}: ${ZFSDIR} - tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR} - cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d +zfs: $(DEBS) +$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1) +$(ZFS_DEB1): $(ZFSDIR) + cd $(ZFSDIR); dpkg-buildpackage -b -uc -us + lintian $(DEBS) + +$(ZFS_DSC): $(ZFSDIR) + tar czf zfs-linux_$(ZFSVER).orig.tar.gz $(ZFSDIR) + cd $(ZFSDIR); dpkg-buildpackage -S -uc -us -d lintian $@ -${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG} - rm -rf ${ZFSDIR} ${ZFSDIR}.tmp - cp -a ${ZFSSRC} ${ZFSDIR}.tmp - cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian - mv ${ZFSDIR}.tmp ${ZFSDIR} +$(ZFSDIR): $(ZFSSRC)/README.md $(ZFSSRC) debian + rm -rf $(ZFSDIR) $(ZFSDIR).tmp + cp -a $(ZFSSRC) $(ZFSDIR).tmp + cp -a debian $(ZFSDIR).tmp/debian + mv $(ZFSDIR).tmp $(ZFSDIR) .PHONY: clean clean: - rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR} + rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* $(ZFSDIR) .PHONY: distclean distclean: clean .PHONY: upload -upload: ${DEBS} - tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64 +upload: $(DEBS) + tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64 -- 2.39.5