proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-14 15:58:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: pull REPOID into top-level Makefile

Browse Source 
otherwise it is missing when building in a clean chroot via a generated
source packages.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2018-10-17 13:02:02 +02:00 committed by Thomas Lamprecht
parent 1b9008bff2
commit fb992042c6
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -9,6 +9,9 @@ SUBDIRS = aplinfo PVE bin www services configs network-hooks test
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell git rev-parse HEAD) GITVERSION:=$(shell git rev-parse HEAD)
# possibly set via debian/rules(.env)
REPOID?=$(shell git rev-parse --short=8 HEAD)
DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
all: ${SUBDIRS} all: ${SUBDIRS}
@ -28,6 +31,7 @@ $(DEB):
mkdir dest mkdir dest
rsync -a * dest rsync -a * dest
echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" > dest/debian/SOURCE echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" > dest/debian/SOURCE
echo "REPOID_GENERATED=${REPOID}" > dest/debian/rules.env
cd dest; dpkg-buildpackage -b -us -uc cd dest; dpkg-buildpackage -b -us -uc
# supress lintian error: statically-linked-binary usr/bin/pvemailforward # supress lintian error: statically-linked-binary usr/bin/pvemailforward
lintian -X binaries ${DEB} lintian -X binaries ${DEB}

2
PVE/Makefile
View File

@ -17,8 +17,6 @@ PERLSOURCE = \
all: pvecfg.pm ${SUBDIRS} all: pvecfg.pm ${SUBDIRS}
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
REPOID=$(shell git rev-parse --short=8 HEAD)
pvecfg.pm: pvecfg.pm.in pvecfg.pm: pvecfg.pm.in
sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGERELEASE@/${PACKAGERELEASE}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@REPOID@/${REPOID}/ $< >$@.tmp sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGERELEASE@/${PACKAGERELEASE}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@REPOID@/${REPOID}/ $< >$@.tmp
mv $@.tmp $@ mv $@.tmp $@

4
debian/rules vendored
View File

@ -1,5 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
include debian/rules.env
export REPOID=${REPOID_GENERATED}
override_dh_compress: override_dh_compress:
dh_compress -Xaplinfo.dat dh_compress -Xaplinfo.dat