switch packaging to be Proxmox branded

SBAT version is 3 (as opposed to Debian's 4) since we haven't shipped a version
3 Grub that doesn't have the version 3 fixes..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/control b/debian/control
index 1c48f28e2d6528eafb642d7b24e4df7e30169916..71a14c941ff32637bf24c620e6d41d693b056070 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: grub2
 Section: admin
 Priority: optional
-Maintainer: GRUB Maintainers <pkg-grub-devel@alioth-lists.debian.net>
-Uploaders: Felix Zielcke <fzielcke@z-51.de>, Jordi Mallach <jordi@debian.org>, Steve McIntyre <93sam@debian.org>, Julian Andres Klode <jak@debian.org>
+Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper-compat (= 13),
  patchutils,
  python3,
@@ -777,3 +776,8 @@ Section: debian-installer
 Architecture: linux-any kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: export GRUB filesystems using FUSE
+
+Package: proxmox-grub
+Architecture: any
+Depends: grub-efi-amd64 (= ${binary:Version}) | grub-efi-ia32 (= ${binary:Version}) | grub-efi-arm64 (= ${binary:Version})
+Description: Empty package to ensure Proxmox Grub packages are installed.

diff --git a/debian/rules b/debian/rules
index d974316dc2d7a6a208a7d9b3d53b2fc2787cfb7c..04b346f2343ea71f8c7ec689064d15abee16bd29 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,7 @@ endif
 # rebuild grub, need a programmatic way to get the vendor, as it's used by build-efi-images
 # to create the monolithic Grub image and thus is needed to create the partitions on the EFI
 # media. Add it to the control file user metadata: XB-Efi-Vendor: $vendor
-SB_EFI_VENDOR ?= $(shell dpkg-vendor --query vendor | tr '[:upper:]' '[:lower:]')
+SB_EFI_VENDOR ?= proxmox
 
 %:
        dh $@ --with=bash_completion

diff --git a/debian/sbat.proxmox.csv.in b/debian/sbat.proxmox.csv.in
new file mode 100644 (file)
index 0000000..37809af
--- /dev/null
+++ b/debian/sbat.proxmox.csv.in
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+grub,3,Free Software Foundation,grub,@UPSTREAM_VERSION@,https://www.gnu.org/software/grub/
+grub.proxmox,1,Proxmox,grub2,@DEB_VERSION@,https://git.proxmox.com/?p=grub2.git

diff --git a/debian/signing-template/changelog.in b/debian/signing-template/changelog.in
index 3b4df18da75a822d83f0023592e40eee86906511..327c5e6dbb59403c1f43df26c62986d257bc3ef4 100644 (file)
--- a/debian/signing-template/changelog.in
+++ b/debian/signing-template/changelog.in
@@ -2,7 +2,7 @@
 
   * Update to grub2 @version_binary@
 
- -- Debian signing service <ftpmaster@debian.org>  @date@
+ -- Proxmox signing service <support@proxmox.com>  @date@
 
 @pkg_signed@ (1) unstable; urgency=medium