312ce78084
This add support to enable vlan aware bridge,
and management interfaces
example: 1 bridge and 1 administration port on vlan 100
auto vmbr0
iface vmbr0 inet manual
bridge_ports eth0
bridge_stp off
bridge_fd 0
bridge_vlan_aware yes
bridge_vids 10-15
auto vmbr0.100
iface vmbr0.100 inet static
address X.X.X.X
netmask 255.255.255.0
gateway X.X.X.X
bridge_vids is optional, and allow on the specified vlans.(current take 1 value or range, need to be improve with list)
If not specified, the allowed vlan are 2-4094.
vlan 1 is the default pvid. (all untagged traffic is going to this vlan).
scripts:
- /etc/network/if-up.d/bridgevlan
manage bridge vlan aware configuration
- /etc/network/if-up.d/bridgevlanport
manage bridge vlan admin port
-/etc/network/if-pre-up.d/vlan
-/etc/network/if-post-down.d/vlan
replace current vlan package, without vconfig usage and cleanups
It's only needed to create vlan interface from bridge_ports.
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
123 lines
4.5 KiB
Makefile
123 lines
4.5 KiB
Makefile
include defines.mk
|
|
|
|
DESTDIR=
|
|
|
|
#SUBDIRS = bin lib www aplinfo
|
|
SUBDIRS = aplinfo PVE bin www po
|
|
|
|
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
|
GITVERSION:=$(shell cat .git/refs/heads/master)
|
|
|
|
DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
|
|
|
|
all: ${SUBDIRS}
|
|
|
|
check:
|
|
${MAKE} -C bin/test check
|
|
|
|
%:
|
|
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
|
|
|
|
pve-repo-ca-certificates.crt:
|
|
rm -rf ca-tmp
|
|
mkdir ca-tmp
|
|
cd ca-tmp; wget http://aia.startssl.com/certs/sub.class1.server.ca.pem
|
|
cd ca-tmp; wget http://aia.startssl.com/certs/ca.pem
|
|
cd ca-tmp; cat *.pem >../$@
|
|
|
|
.PHONY: dinstall
|
|
dinstall: ${DEB}
|
|
dpkg -i ${DEB}
|
|
|
|
country.dat: country.pl
|
|
./country.pl > country.dat
|
|
|
|
.PHONY: ${DEB}
|
|
${DEB} deb:
|
|
make clean
|
|
rm -rf dest
|
|
mkdir dest
|
|
make DESTDIR=`pwd`/dest install
|
|
mkdir dest/DEBIAN
|
|
sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@PACKAGERELEASE@/${PACKAGERELEASE}/ debian/control.in >dest/DEBIAN/control
|
|
install -m 0644 debian/conffiles dest/DEBIAN
|
|
install -m 0755 debian/config dest/DEBIAN
|
|
install -m 0644 debian/templates dest/DEBIAN
|
|
install -m 0755 debian/preinst dest/DEBIAN
|
|
install -m 0755 debian/postinst dest/DEBIAN
|
|
install -m 0755 debian/prerm dest/DEBIAN
|
|
install -m 0755 debian/postrm dest/DEBIAN
|
|
install -m 0644 debian/triggers dest/DEBIAN
|
|
echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" > dest/usr/share/doc/${PACKAGE}/SOURCE
|
|
gzip --best dest/usr/share/man/*/*
|
|
gzip --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
|
|
dpkg-deb --build dest
|
|
mv dest.deb ${DEB}
|
|
rm -rf dest
|
|
# supress lintian error: statically-linked-binary usr/bin/pvemailforward
|
|
lintian -X binaries ${DEB}
|
|
|
|
.PHONY: upload
|
|
upload: ${DEB} check
|
|
./repoid.pl .git check
|
|
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
|
|
|
|
#.PHONY: poupload
|
|
#poupload:
|
|
# rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/
|
|
|
|
.PHONY: aplupload
|
|
aplupload:
|
|
./aplinfo/apltest.pl
|
|
gpg -bas -u support@proxmox.com aplinfo/aplinfo.dat
|
|
gzip -c aplinfo/aplinfo.dat > aplinfo.dat.gz
|
|
scp aplinfo/aplinfo.dat aplinfo.dat.gz aplinfo/aplinfo.dat.asc download1.proxmox.com:/home/ftp/appliances/
|
|
|
|
.PHONY: install
|
|
install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf pve-repo-ca-certificates.crt mtu bridgevlan bridgevlanport vlan vlan-down
|
|
install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy
|
|
install -D -m 0644 debian/pve.logrotate ${DESTDIR}/etc/logrotate.d/pve
|
|
install -d ${DESTDIR}/usr/share/${PACKAGE}
|
|
install -d ${DESTDIR}/usr/share/man/man1
|
|
install -d ${DOCDIR}/examples
|
|
install -d ${DESTDIR}/var/lib/${PACKAGE}
|
|
install -d ${DESTDIR}/var/lib/vz/images
|
|
install -d ${DESTDIR}/var/lib/vz/template/cache
|
|
install -d ${DESTDIR}/var/lib/vz/template/iso
|
|
install -d ${DESTDIR}/var/lib/vz/template/qemu
|
|
install -D -m 0644 pve-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pveconf
|
|
install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list
|
|
install -D -m 0644 pve-repo-ca-certificates.crt ${DESTDIR}/etc/apt/pve-repo-ca-certificates.crt
|
|
install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
|
|
install -D -m 0755 vznet.conf ${DESTDIR}/etc/vz/vznet.conf
|
|
install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu
|
|
install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan
|
|
install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport
|
|
install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
|
|
install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
|
|
|
|
install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
|
|
install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
|
|
install -m 0644 copyright ${DOCDIR}
|
|
install -m 0644 debian/changelog.Debian ${DOCDIR}
|
|
install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}
|
|
# temporary: set ExtJS 5 migration devel directory
|
|
install -d ${DESTDIR}/usr/share/${PACKAGE}/manager5
|
|
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
|
|
|
|
.PHONY: distclean
|
|
distclean: clean
|
|
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
|
|
find . -name '*~' -exec rm {} ';'
|
|
rm -rf dest country.dat *.deb ca-tmp
|