Compare commits

...

27 Commits

Author SHA1 Message Date
Thomas Lamprecht
e96564cc84 d/control: wrap-and-sort -tkn
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2024-11-20 11:42:18 +01:00
Thomas Lamprecht
1f91c45839 bump version to 8.3.0
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2024-11-20 11:42:11 +01:00
Thomas Lamprecht
73261d652c d/copyright: update years
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2024-04-17 07:39:22 +02:00
Thomas Lamprecht
c65b162555 bump version to 8.2.0
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2024-04-17 07:38:35 +02:00
Fabian Grünbichler
1eea6248bf apt hook: disable on remove
and (re-)enable on install. adapted from apt-listbugs/apt-listchanges, which
solve the issue of removing (instead of purging) the conffile and hook binary
providing package in the same fashion.

Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
2024-04-16 17:03:13 +02:00
Fabian Grünbichler
e291a8cc4c d/control: wrap-and-sort
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2024-03-07 09:32:54 +01:00
Fabian Grünbichler
562233f4fe proxmox-ve: add systemd-sys to depends
Proxmox VE only works with systemd as PID1, encode it in the meta dependencies
to prevent accidentally switching the (default) init system on the package
level.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2024-03-07 09:25:39 +01:00
Thomas Lamprecht
493beb5f94 drop postinst/rm, moved to meta package for default-kernel
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-11-23 10:51:38 +01:00
Thomas Lamprecht
334c1dc288 bump version to 8.1.0
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-11-23 10:34:46 +01:00
Fabian Grünbichler
06586cceb4 bump version to 8.0.2
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2023-08-01 12:18:54 +02:00
Fabian Grünbichler
8b8bb0fb55 switch to new proxmox-kernel (meta) packages
and force upgrade of proxmox-kernel-helper/pve-manager with support for the new
package names.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2023-08-01 12:18:54 +02:00
Thomas Lamprecht
38b4f5f2b9 bump version to 8.0.1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-12 11:10:18 +02:00
Thomas Lamprecht
2af920f2ba switch dependency over to proxmox-kernel-helper package
this got split out from the kernel meta package due to clashing with
multiple versions of that package, and with the split we took the
chance to rename it to something less pve centric, as it's reused by
all Proxmox projects that require a kernel.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-12 10:14:01 +02:00
Thomas Lamprecht
507ad33f3c d/control: normalize via wrap-and-sort -tkn
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-12 09:45:09 +02:00
Thomas Lamprecht
3daa6d1c1b add .gitignore file
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:39:13 +02:00
Thomas Lamprecht
c82724795c buildsys: drop passing arch to upload for arch-all package
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:36:28 +02:00
Thomas Lamprecht
1882eab361 bump version to 8.0.0
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
47e90efb39 depend on 6.2 by default
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
f8fa16d247 d/control: define compat level via build-depends and raise to 13
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
478ad35420 d/control: drop dependency on vncterm and spiceterm
pve-manager, which already depends on them, is the better place for
this.

Plus, those two are a bit dated and nowadays the termproxy + xterm.js
stack provides better UX and more features.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
818f19584e d/control: add missing ${misc:Depends}
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
02b5e38ec9 d/control: drop ancient conflict/replace entries
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
f344e0078b buildsys: derive upload dist automatically
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:35:45 +02:00
Thomas Lamprecht
fb843ee998 buildsys: add DSC & sbuild convenience target
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:23:17 +02:00
Thomas Lamprecht
7dea9dbcfd buildsys: make build-dir generation atomic
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:22:38 +02:00
Thomas Lamprecht
bea910049e d/rules: use dh wildcard rule
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 20:20:53 +02:00
Thomas Lamprecht
e0046a0b97 makefile: convert to use simple parenthesis
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-05-24 19:59:46 +02:00
12 changed files with 163 additions and 91 deletions

7
.gitignore vendored Normal file
View File

@ -0,0 +1,7 @@
/*.build
/*.buildinfo
/*.changes
/*.deb
/*.dsc
/*.tar*
/proxmox-ve-*/

View File

@ -4,32 +4,48 @@ PACKAGE=proxmox-ve
GITVERSION:=$(shell git rev-parse HEAD)
PVE_DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
PVE_HEADERS_DEB=pve-headers_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION)
DSC=$(PACKAGE)_$(DEB_VERSION).dsc
BUILD_DIR=build
PVE_DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
PVE_HEADERS_DEB=pve-headers_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
DEBS=${PVE_DEB} ${PVE_HEADERS_DEB}
DEBS=$(PVE_DEB) $(PVE_HEADERS_DEB)
all: deb
deb: ${DEBS}
deb: $(DEBS)
${PVE_HEADERS_DEB}: ${PVE_DEB}
${PVE_DEB}: debian
rm -rf ${BUILD_DIR}
mkdir -p ${BUILD_DIR}/debian
cp -ar debian/* ${BUILD_DIR}/debian/
echo "git clone git://git.proxmox.com/git/proxmox-ve.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE
cd ${BUILD_DIR}; dpkg-buildpackage -b -uc -us
lintian ${DEBS}
$(BUILDDIR): debian
rm -rf $@ $@.tmp
mkdir -p $@.tmp/debian
cp -a debian/ $@.tmp/
echo "git clone git://git.proxmox.com/git/proxmox-ve.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
mv $@.tmp $@
$(PVE_HEADERS_DEB): $(PVE_DEB)
$(PVE_DEB): $(BUILDDIR)
cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
lintian $(DEBS)
dsc: $(DSC)
$(MAKE) clean
$(MAKE) $(DSC)
lintian $(DSC)
$(DSC): $(BUILDDIR)
cd $(BUILDDIR); dpkg-buildpackage -S -uc -us
sbuild: $(DSC)
sbuild $(DSC)
.PHONY: upload
upload: ${DEBS}
tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${DEB_BUILD_ARCH}
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
upload: $(DEBS)
tar cf - $(DEBS)|ssh repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
.PHONY: distclean
distclean: clean
.PHONY: clean
clean:
rm -rf *~ ${BUILD_DIR} *.deb *.dsc *.changes *.buildinfo
rm -rf *~ $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar.* *.deb *.dsc *.changes *.build *.buildinfo

59
debian/changelog vendored
View File

@ -1,3 +1,62 @@
proxmox-ve (8.3.0) bookworm; urgency=medium
* bump for Proxmox VE 8.3
-- Proxmox Support Team <support@proxmox.com> Wed, 20 Nov 2024 11:42:06 +0100
proxmox-ve (8.2.0) bookworm; urgency=medium
* drop postinst/rm scripts that managed the links to the current default
kernel for fallback use, this moved to the new separate meta package for
default-kernel
* add systemd-sys to depends to better encode that Proxmox VE only works
with systemd as PID1
* disable the apt hook, that ensures that Proxmox VE is not deinstalled by
accident due to some botched repository configuration from the user, when
the meta package is actually removed to avoid issues on purge.
-- Proxmox Support Team <support@proxmox.com> Wed, 17 Apr 2024 07:38:30 +0200
proxmox-ve (8.1.0) bookworm; urgency=medium
* bump for Proxmox VE 8.1
-- Proxmox Support Team <support@proxmox.com> Thu, 23 Nov 2023 09:25:11 +0100
proxmox-ve (8.0.2) bookworm; urgency=medium
* switch to new Proxmox kernel meta packages
* make pve-headers transitional to switch to proxmox-default-headers
-- Proxmox Support Team <support@proxmox.com> Tue, 01 Aug 2023 11:39:53 +0200
proxmox-ve (8.0.1) bookworm; urgency=medium
* switch dependency over to proxmox-kernel-helper package (again)
-- Proxmox Support Team <support@proxmox.com> Mon, 12 Jun 2023 11:10:13 +0200
proxmox-ve (8.0.0) bookworm; urgency=medium
* re-build for Proxmox VE 8 / Debian 12 Bookworm
* depene on Linux Kernel 6.2 by default
* switch to native versioning scheme
-- Proxmox Support Team <support@proxmox.com> Wed, 24 May 2023 20:06:19 +0200
proxmox-ve (7.4-1) bullseye; urgency=medium
* depend on proxmox-kernel-helper
* bump version for Proxmox VE 7.4
-- Proxmox Support Team <support@proxmox.com> Mon, 20 Mar 2023 21:19:15 +0100
proxmox-ve (7.3-1) bullseye; urgency=medium
* bump version for Proxmox VE 7.3

1
debian/compat vendored
View File

@ -1 +0,0 @@
12

27
debian/control vendored
View File

@ -2,26 +2,24 @@ Source: proxmox-ve
Section: admin
Priority: optional
Maintainer: Proxmox Support Team <support@proxmox.com>
Build-Depends: debhelper (>=12~), lintian
Standards-Version: 4.5.1
Build-Depends: debhelper-compat (= 13), lintian,
Standards-Version: 4.6.2
Homepage: https://www.proxmox.com
Package: proxmox-ve
Architecture: all
Provides: proxmox-virtual-environment
Conflicts: proxmox-ve-3.10.0, proxmox-virtual-environment, pve-kernel
Replaces: proxmox-ve-3.10.0, proxmox-virtual-environment, pve-kernel
Provides: proxmox-virtual-environment,
Depends: apt,
openssh-client,
openssh-server,
proxmox-archive-keyring,
pve-kernel-5.15,
pve-kernel-helper,
pve-manager,
proxmox-default-kernel,
proxmox-kernel-helper (>= 8.0.3),
pve-manager (>= 8.0.4),
pve-qemu-kvm,
qemu-server,
spiceterm,
vncterm,
systemd-sysv,
${misc:Depends},
Description: Proxmox Virtual Environment
The Proxmox Virtual Environment is an easy to use Open Source
virtualization platform for running Virtual Appliances and Virtual
@ -30,7 +28,8 @@ Description: Proxmox Virtual Environment
Package: pve-headers
Architecture: all
Depends: pve-headers-5.15
Description: Default Proxmox VE Kernel Headers
This is a metapackage which will install the kernel headers for the
current default kernel.
Depends: proxmox-default-headers, ${misc:Depends},
Section: oldlibs
Description: Default Proxmox Kernel Headers (transitional package)
This is a dummy transitional package to transition to proxmox-default-headers.
It can be safely removed.

2
debian/copyright vendored
View File

@ -1,4 +1,4 @@
Copyright (C) 2016 - 2023 Proxmox Server Solutions GmbH <support@proxmox.com>
Copyright (C) 2016 - 2024 Proxmox Server Solutions GmbH <support@proxmox.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

17
debian/postinst vendored
View File

@ -1,17 +0,0 @@
#! /bin/sh
# Abort if any command returns an error value
set -e
case "$1" in
configure)
# setup kernel links for installation CD (rescue boot)
mkdir -p /boot/pve || true
ln -sf /boot/pve/vmlinuz-5.15 /boot/pve/vmlinuz || true
ln -sf /boot/pve/initrd.img-5.15 /boot/pve/initrd.img || true
;;
esac
#DEBHELPER#
exit 0

20
debian/postrm vendored
View File

@ -1,20 +0,0 @@
#! /bin/sh
# Abort if any command returns an error value
set -e
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
# remove kernel symlinks
rm -f /boot/pve/vmlinuz || true
rm -f /boot/pve/initrd.img || true
rmdir --ignore-fail-on-non-empty /boot/pve/ || true
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#

35
debian/proxmox-ve.postrm vendored Normal file
View File

@ -0,0 +1,35 @@
#! /bin/sh
set -e
hook=/etc/apt/apt.conf.d/10pveapthook
case "$1" in
purge)
rm -f $hook.disabled
;;
remove)
if test -f $hook; then
mv $hook $hook.disabled
fi
;;
abort-install)
if test "x$2" != "x" && test -f $hook
then
mv $hook $hook.disabled
fi
;;
upgrade|failed-upgrade|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
esac
#DEBHELPER#
exit 0

13
debian/proxmox-ve.preinst vendored Normal file
View File

@ -0,0 +1,13 @@
#!/bin/sh
set -e
hook=/etc/apt/apt.conf.d/10pveapthook
if test -f $hook.disabled
then
mv $hook.disabled $hook
fi
#DEBHELPER#
exit 0

24
debian/rules vendored
View File

@ -4,25 +4,5 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
install:
dh_install
dh_installdocs
dh_lintian
dh_installchangelogs
dh_installman
dh_strip_nondeterminism
dh_compress
dh_fixperms
binary: install
dh_strip
dh_makeshlibs
dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
.PHONY: build clean
build clean:
%:
dh $@

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (native)