-RELEASE=3.2
-
PACKAGE=novnc-pve
-PKGREL=1
+VER=1.0.0
+PKGREL=2
-NOVNCDIR=novnc
-NOVNCSRC=${NOVNCDIR}.tgz
-NOVNCVER=0.4
+SRCDIR=novnc
+BUILDDIR=${SRCDIR}.tmp
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
-DEB=${PACKAGE}_${NOVNCVER}-${PKGREL}_${ARCH}.deb
+GITVERSION:=$(shell git rev-parse HEAD)
-all: deb
+DEB=${PACKAGE}_${VER}-${PKGREL}_${ARCH}.deb
-.PHONY: dinstall
-dinstall: deb
- dpkg -i ${DEB}
+all: ${DEB}
+ @echo ${DEB}
.PHONY: deb
-deb ${DEB}: ${TARSRC}
- rm -rf ${NOVNCDIR}
- tar xf ${NOVNCSRC}
- mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
- cp -a debian ${NOVNCDIR}/debian
- cp vnc_pve.html ${NOVNCDIR}
- # fix file permissions
- chmod 0644 ${NOVNCDIR}/include/jsunzip.js
- echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${NOVNCDIR}/debian/SOURCE
- cd ${NOVNCDIR}; dpkg-buildpackage -b -uc -us
+deb: ${DEB}
+${DEB}: | submodule
+ rm -rf ${BUILDDIR}
+ cp -rpa ${SRCDIR} ${BUILDDIR}
+ cp -a debian ${BUILDDIR}
+ echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+ cd ${BUILDDIR}; dpkg-buildpackage -rfakeroot -b -uc -us
lintian ${DEB}
+ @echo ${DEB}
+
+.PHONY: submodule
+submodule:
+ test -f "${SRCDIR}/vnc.html" || git submodule update --init
.PHONY: download
-download:
- rm -rf ${NOVNCDIR}
- git clone git://github.com/kanaka/noVNC ${NOVNCDIR}
- tar czf ${NOVNCSRC} ${NOVNCDIR}
+download ${SRCDIR}:
+ git submodule foreach 'git pull --ff-only origin master'
.PHONY: upload
upload: ${DEB}
- umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw
- mkdir -p /pve/${RELEASE}/extra
- rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
- rm -f /pve/${RELEASE}/extra/Packages*
- cp ${DEB} /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 - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist stretch
.PHONY: distclean
distclean: clean
.PHONY: clean
clean:
- rm -rf *~ debian/*~ *_${ARCH}.deb *_all.deb *.changes *.dsc novnc
+ rm -rf *~ debian/*~ *.deb ${BUILDDIR} *.changes *.dsc *.buildinfo
+
+.PHONY: dinstall
+dinstall: deb
+ dpkg -i ${DEB}