c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update Makefile for new structure

Browse Source 
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2019-02-05 17:31:19 +01:00
parent ac43a7be1f
commit 2a904e377e
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -8,10 +8,12 @@ SPLPKGREL=pve1~bpo1
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL}
SPLDIR=spl-build SPLDIR=spl-${ZFSVER}
SPLSRC=spl-debian SPLSRC=spl/upstream
ZFSDIR=zfs-build SPLPKG=spl/debian
ZFSSRC=zfs-debian ZFSDIR=zfs-${ZFSVER}
ZFSSRC=zfs/upstream
ZFSPKG=zfs/debian
SPL_DEB = \ SPL_DEB = \
spl_${SPLPKGVER}_amd64.deb spl_${SPLPKGVER}_amd64.deb
@ -40,8 +42,8 @@ dinstall: ${DEBS}
.PHONY: submodule .PHONY: submodule
submodule: submodule:
test -f "${ZFSSRC}/debian/changelog" || git submodule update --init test -f "${ZFSSRC}/README.markdown" || git submodule update --init
test -f "${SPLSRC}/debian/changelog" || git submodule update --init test -f "${SPLSRC}/README.markdown" || git submodule update --init
.PHONY: spl .PHONY: spl
spl: ${SPL_DEB} spl: ${SPL_DEB}
@ -49,11 +51,7 @@ ${SPL_DEB}: ${SPLSRC}
rm -rf ${SPLDIR} rm -rf ${SPLDIR}
mkdir ${SPLDIR} mkdir ${SPLDIR}
cp -a ${SPLSRC}/* ${SPLDIR}/ cp -a ${SPLSRC}/* ${SPLDIR}/
mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org cp -a ${SPLPKG} ${SPLDIR}/debian
cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
cd ${SPLDIR}; ln -s ../spl-patches patches
cd ${SPLDIR}; quilt push -a
cd ${SPLDIR}; rm -rf .pc ./patches
cd ${SPLDIR}; dpkg-buildpackage -b -uc -us cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
.PHONY: zfs .PHONY: zfs
@ -63,11 +61,7 @@ $(ZFS_DEB1): $(ZFSSRC)
rm -rf ${ZFSDIR} rm -rf ${ZFSDIR}
mkdir ${ZFSDIR} mkdir ${ZFSDIR}
cp -a ${ZFSSRC}/* ${ZFSDIR}/ cp -a ${ZFSSRC}/* ${ZFSDIR}/
mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org cp -a ${ZFSPKG} ${ZFSDIR}/debian
cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
cd ${ZFSDIR}; ln -s ../zfs-patches patches
cd ${ZFSDIR}; quilt push -a
cd ${ZFSDIR}; rm -rf .pc ./patches
cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
.PHONY: clean .PHONY: clean
@ -77,7 +71,6 @@ clean:
.PHONY: distclean .PHONY: distclean
distclean: clean distclean: clean
.PHONY: upload .PHONY: upload
upload: ${DEBS} upload: ${DEBS}
tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64 tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64