update to debian/2.02+dfsg1-18

[zfs-grub.git] / Makefile

diff --git a/Makefile b/Makefile
index 23c963eb83f0c7b9cb3c4978919c89d3de16afdb..7f72e3a6fe9d66d9b794268f6363d1eccad58328 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
-RELEASE=4.0
+RELEASE=5.0
 
 GRUB_DIR=grub
 GRUB_SRC=${GRUB_DIR}.tar.gz
-SNAPVER=2.02-beta2.9-ZOL11-7aa9f6
+TAG=debian/2.02+dfsg1-18
 
 # update/sync changelog.pve
-DEBVER=2.02-pve4
+DEBVER=2.02-pve6
 
 PC_DEBS=                                       \
+grub2_${DEBVER}_amd64.deb                      \
 grub2-common_${DEBVER}_amd64.deb               \
 grub-common_${DEBVER}_amd64.deb                        \
 grub-efi-amd64-bin_${DEBVER}_amd64.deb         \
@@ -31,8 +32,9 @@ all: ${DEBS}
 dinstall: ${DEBS}
        dpkg -i ${PC_DEBS}
 
-.PHONY: grub
-grub ${DEBS}:
+${DEBS}: deb
+.PHONY: deb
+deb:
        rm -rf ${GRUB_DIR}
        tar xf ${GRUB_SRC}
        mv ${GRUB_DIR}/debian/changelog ${GRUB_DIR}/debian/changelog.org
@@ -42,28 +44,21 @@ grub ${DEBS}:
        # hack: remove quilt dir, so that dpkg-buildpackage correctly apply
        # all debian patches
        rm -rf ${GRUB_DIR}/.pc ${GRUB_DIR}/patches
-       cd ${GRUB_DIR}; dpkg-buildpackage -b -uc -us 
+       cd ${GRUB_DIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: download
 download:
        rm -rf grub ${GRUB_SRC} ${GRUB_SRC}.tmp
-       git clone https://github.com/zfsonlinux/grub
-       cd grub; git checkout snapshot/debian/jessie/${SNAPVER}
+       git clone --recursive -b ${TAG} https://salsa.debian.org/grub-team/grub.git
        tar czf ${GRUB_SRC}.tmp grub
        mv ${GRUB_SRC}.tmp ${GRUB_SRC}
 
 .PHONY: upload
 upload: ${DEBS}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/grub2-*.deb
-       rm -f /pve/${RELEASE}/extra/grub-*.deb
-       cp ${DEBS} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch amd64
 
 .PHONY: distclean
 distclean: clean
 
 clean:
-       rm -rf *~ *.deb *.udeb *.changes ${GRUB_DIR}
+       rm -rf *~ *.deb *.udeb *.changes *.buildinfo ${GRUB_DIR}