X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=f5f4127e57fec0223ec9c8047eeace0ba680a937;hb=f46e8fbf9b90a692c4ef7a868db897c4d8715e81;hp=d88440bf3688db1abe1af80a81052112d044cd3a;hpb=cb60da33cdb26ed679f55f9138d9047fba6b36c4;p=lxc.git diff --git a/Makefile b/Makefile index d88440b..f5f4127 100644 --- a/Makefile +++ b/Makefile @@ -1,39 +1,49 @@ PACKAGE=lxc-pve -LXCVER=2.1.0 -DEBREL=2 +LXCVER=3.0.2+pve1 +DEBREL=1 SRCDIR=lxc -SRCTAR=${SRCDIR}.tgz +BUILDSRC := $(SRCDIR).tmp ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -GITVERSION:=$(shell cat .git/refs/heads/master) +GITVERSION:=$(shell git rev-parse HEAD) DEB1=${PACKAGE}_${LXCVER}-${DEBREL}_${ARCH}.deb DEB2=${PACKAGE}-dev_${LXCVER}-${DEBREL}_${ARCH}.deb \ - ${PACKAGE}-dbg_${LXCVER}-${DEBREL}_${ARCH}.deb + ${PACKAGE}-dbgsym_${LXCVER}-${DEBREL}_${ARCH}.deb DEBS=$(DEB1) $(DEB2) all: ${DEBS} echo ${DEBS} +.PHONY: submodule +submodule: + test -f "${SRCDIR}/debian/changelog" || git submodule update --init + .PHONY: deb deb: ${DEBS} $(DEB2): $(DEB1) -$(DEB1): ${SRCTAR} - rm -rf ${SRCDIR} - tar xf ${SRCTAR} - cp -a debian ${SRCDIR}/debian - echo "git clone git://git.proxmox.com/git/lxc.git\\ngit checkout ${GITVERSION}" > ${SRCDIR}/debian/SOURCE - cd ${SRCDIR}; dpkg-buildpackage -rfakeroot -b -us -uc - lintian ${DEBS} - - -.PHONY: download -download ${SRCTAR}: - rm -rf ${SRCDIR} ${SRCTAR} - git clone -b lxc-${LXCVER} git://github.com/lxc/lxc - tar czf ${SRCTAR}.tmp ${SRCDIR} - mv ${SRCTAR}.tmp ${SRCTAR} +$(DEB1): | submodule + rm -f *.deb + rm -rf $(BUILDSRC) + cp -a $(SRCDIR) $(BUILDSRC) + cp -a debian $(BUILDSRC)/debian + mkdir $(BUILDSRC)/debian/config + for i in config/*.conf.in; do \ + sed -e 's|@LXCTEMPLATECONFIG@|/usr/share/lxc/config|g' $$i > $(BUILDSRC)/debian/$${i%.in} ; \ + done + echo "git clone git://git.proxmox.com/git/lxc.git\\ngit checkout $(GITVERSION)" > $(BUILDSRC)/debian/SOURCE + cd $(BUILDSRC); dpkg-buildpackage -rfakeroot -b -us -uc + lintian $(DEBS) + +.PHONY: update-template-configs +update-template-configs: + test -d lxc-templates || git clone https://github.com/lxc/lxc-templates lxc-templates + cd lxc-templates && git pull + rm -rf config + cp -R lxc-templates/config config + rm -f config/*.am config/*.m4 + git add config .PHONY: upload upload: ${DEBS} @@ -43,8 +53,7 @@ distclean: clean .PHONY: clean clean: - rm -rf ${SRCDIR} ${SRCDIR}.tmp *_${ARCH}.deb *.changes *.dsc *.buildinfo - find . -name '*~' -exec rm {} ';' + rm -rf $(BUILDSRC) *_${ARCH}.deb *.changes *.dsc *.buildinfo .PHONY: dinstall dinstall: ${DEBS}