Update OMV to buster/ursul, compile focal as well

ayufan-rock64 · Apr 2, 2020 · cb2e170 · cb2e170
1 parent 1d9792c
commit cb2e170
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 85 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -52,23 +52,14 @@ release:
   when: manual
   allow_failure: true
 
-ubuntu-bionic-mate-armhf: *build_manual
-ubuntu-bionic-mate-arm64: *build_manual
-
-ubuntu-disco-mate-armhf: *build_manual
-ubuntu-disco-mate-arm64: *build_manual
-
-debian-stretch-openmediavault-armhf: *build_manual
-debian-stretch-openmediavault-arm64: *build_manual
-
-debian-stretch-minimal-armhf: *build
-debian-stretch-minimal-arm64: *build
+ubuntu-focal-mate-armhf: *build_manual
+ubuntu-focal-mate-arm64: *build_manual
 
 debian-buster-minimal-armhf: *build
 debian-buster-minimal-arm64: *build
 
-ubuntu-bionic-minimal-armhf: *build
-ubuntu-bionic-minimal-arm64: *build
+debian-buster-openmediavault-armhf: *build_manual
+debian-buster-openmediavault-arm64: *build_manual
 
-ubuntu-disco-minimal-armhf: *build
-ubuntu-disco-minimal-arm64: *build
+ubuntu-focal-minimal-armhf: *build
+ubuntu-focal-minimal-arm64: *build
diff --git a/configs/debian-buster-openmediavault/archives/omv.key.chroot b/configs/debian-buster-openmediavault/archives/omv.key.chroot
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=LL0y
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/configs/debian-buster-openmediavault/archives/omv.list.chroot b/configs/debian-buster-openmediavault/archives/omv.list.chroot
@@ -0,0 +1 @@
+deb http://packages.openmediavault.org/public/ usul main
diff --git a/...penmediavault/hooks/95-install-omv.chroot → ...penmediavault/hooks/95-install-omv.chroot b/...penmediavault/hooks/95-install-omv.chroot → ...penmediavault/hooks/95-install-omv.chroot
@@ -25,9 +25,9 @@ apt-get update -y
 apt-get --force-yes -y install openmediavault
 
 # install omvextras.org
-wget http://omv-extras.org/openmediavault-omvextrasorg_latest_all4.deb
-dpkg -i openmediavault-omvextrasorg_latest_all4.deb
-rm openmediavault-omvextrasorg_latest_all4.deb
+wget http://omv-extras.org/openmediavault-omvextrasorg_latest_all5.deb
+dpkg -i openmediavault-omvextrasorg_latest_all5.deb
+rm openmediavault-omvextrasorg_latest_all5.deb
 
 # remove hacks
 mv /usr/bin/newaliases.bak /usr/bin/newaliases

diff --git a/...ediavault/package-lists/extra.list.chroot → ...ediavault/package-lists/extra.list.chroot b/...ediavault/package-lists/extra.list.chroot → ...ediavault/package-lists/extra.list.chroot
diff --git a/configs/debian-stretch-openmediavault/archives/omv.key.chroot b/configs/debian-stretch-openmediavault/archives/omv.key.chroot
diff --git a/configs/debian-stretch-openmediavault/archives/omv.list.chroot b/configs/debian-stretch-openmediavault/archives/omv.list.chroot
diff --git a/configs/ubuntu-bionic-i3/package-lists/i3.list.chroot b/configs/ubuntu-bionic-i3/package-lists/i3.list.chroot
diff --git a/configs/ubuntu-bionic-mate/.gitkeep b/configs/ubuntu-bionic-mate/.gitkeep
diff --git a/configs/ubuntu-bionic-mate/package-lists/apps.list.chroot b/configs/ubuntu-bionic-mate/package-lists/apps.list.chroot
diff --git a/configs/ubuntu-bionic-minimal/.gitkeep b/configs/ubuntu-bionic-minimal/.gitkeep
diff --git a/configs/ubuntu-disco-mate/.gitkeep b/configs/ubuntu-disco-mate/.gitkeep
diff --git a/configs/ubuntu-disco-mate/package-lists/apps.list.chroot b/configs/ubuntu-disco-mate/package-lists/apps.list.chroot
diff --git a/configs/ubuntu-disco-mate/package-lists/mate.list.chroot b/configs/ubuntu-disco-mate/package-lists/mate.list.chroot
diff --git a/configs/ubuntu-disco-minimal/.gitkeep b/configs/ubuntu-disco-minimal/.gitkeep
diff --git a/configs/debian-stretch-minimal/.gitkeep → configs/ubuntu-focal-mate/.gitkeep b/configs/debian-stretch-minimal/.gitkeep → configs/ubuntu-focal-mate/.gitkeep
diff --git a/...-bionic-i3/package-lists/apps.list.chroot → ...focal-mate/package-lists/apps.list.chroot b/...-bionic-i3/package-lists/apps.list.chroot → ...focal-mate/package-lists/apps.list.chroot
diff --git a/...ionic-mate/package-lists/mate.list.chroot → ...focal-mate/package-lists/mate.list.chroot b/...ionic-mate/package-lists/mate.list.chroot → ...focal-mate/package-lists/mate.list.chroot
diff --git a/configs/ubuntu-bionic-i3/.gitkeep → configs/ubuntu-focal-minimal/.gitkeep b/configs/ubuntu-bionic-i3/.gitkeep → configs/ubuntu-focal-minimal/.gitkeep
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		deb http://packages.openmediavault.org/public/ usul main