From cb2e170742e2f69affe8abbdc0855e23c1beee2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Thu, 2 Apr 2020 20:35:36 +0200 Subject: [PATCH] Update OMV to buster/ursul, compile focal as well --- .gitlab-ci.yml | 21 +++----- .../archives/omv.key.chroot | 51 +++++++++++++++++++ .../archives/omv.list.chroot | 1 + .../hooks/95-install-omv.chroot | 6 +-- .../package-lists/extra.list.chroot | 0 .../archives/omv.key.chroot | 31 ----------- .../archives/omv.list.chroot | 1 - .../package-lists/i3.list.chroot | 10 ---- configs/ubuntu-bionic-mate/.gitkeep | 0 .../package-lists/apps.list.chroot | 10 ---- configs/ubuntu-bionic-minimal/.gitkeep | 0 configs/ubuntu-disco-mate/.gitkeep | 0 .../package-lists/apps.list.chroot | 10 ---- .../package-lists/mate.list.chroot | 5 -- configs/ubuntu-disco-minimal/.gitkeep | 0 .../.gitkeep | 0 .../package-lists/apps.list.chroot | 0 .../package-lists/mate.list.chroot | 0 .../.gitkeep | 0 19 files changed, 61 insertions(+), 85 deletions(-) create mode 100644 configs/debian-buster-openmediavault/archives/omv.key.chroot create mode 100644 configs/debian-buster-openmediavault/archives/omv.list.chroot rename configs/{debian-stretch-openmediavault => debian-buster-openmediavault}/hooks/95-install-omv.chroot (90%) rename configs/{debian-stretch-openmediavault => debian-buster-openmediavault}/package-lists/extra.list.chroot (100%) delete mode 100644 configs/debian-stretch-openmediavault/archives/omv.key.chroot delete mode 100644 configs/debian-stretch-openmediavault/archives/omv.list.chroot delete mode 100644 configs/ubuntu-bionic-i3/package-lists/i3.list.chroot delete mode 100644 configs/ubuntu-bionic-mate/.gitkeep delete mode 100644 configs/ubuntu-bionic-mate/package-lists/apps.list.chroot delete mode 100644 configs/ubuntu-bionic-minimal/.gitkeep delete mode 100644 configs/ubuntu-disco-mate/.gitkeep delete mode 100644 configs/ubuntu-disco-mate/package-lists/apps.list.chroot delete mode 100644 configs/ubuntu-disco-mate/package-lists/mate.list.chroot delete mode 100644 configs/ubuntu-disco-minimal/.gitkeep rename configs/{debian-stretch-minimal => ubuntu-focal-mate}/.gitkeep (100%) rename configs/{ubuntu-bionic-i3 => ubuntu-focal-mate}/package-lists/apps.list.chroot (100%) rename configs/{ubuntu-bionic-mate => ubuntu-focal-mate}/package-lists/mate.list.chroot (100%) rename configs/{ubuntu-bionic-i3 => ubuntu-focal-minimal}/.gitkeep (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18a700d..28b322a 100644 --- 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 new file mode 100644 index 0000000..e59ed9c --- /dev/null +++ b/configs/debian-buster-openmediavault/archives/omv.key.chroot @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFeFb/MBEADhuwY8nksplqh6c+pgo27UgWb8cIVXgdb4CaeDFxX8uf7gowYN +FkiERpZazl21lWNwruSVPpk1PbnRKa2h6MVXBH6/PKvqkgK6GqCVV0+WSmgKMvHw +mgm9roGmaemh0dC43AnD3uNnFql7NsfMsFKycgljMuSuUpF/Ag4DveHqoE/6KMAG +NLPCf2ju/wnGRI/cx8W2Gq14YyY5v+Us5q9pD4TliQR1GM2hOGNz0UHumvlinCvN ++VwIYcUTn/HIdODzfz8AmGRV3jwzoyGljcE065b45qqsVb3EDkSDKPVEVz4dq/78 +iKWe6xJOPZRGWZ46ziDJ778oQqdqPoIBuHeA8IaUZxZ6rGIbCuOZHNh1YgBA655j +qfQEfPAgoXpKf6n+QJkM/mOYkTcuXMPvac/z+6p51TsukzgH8mOw/UmhhMGfopv9 +5zlkGpKhR6kk2DTaLkM/r6HS+YLLt4p8AUQ12xaLBfjVNSOsoKhuw5O8hXFWtNFm +QWWK+y/pCMHrVwk/l7wRvOSdTknk4KwJ3nXUrrKGa13d7GpE/n5VuBk46/jnm9lo +xW80iY2BS3pRNKwWeTuYDehpQ7La7eGSe13LppbSnvxGdnYNkITdsepoh7kCbGeF +BhCaqNzWyR4oxoBdSUkWN2Z8SmgIzFBakljzMXmX1EFSyhylnMXVaSzhawARAQAB +tFJPcGVuTWVkaWFWYXVsdC5vcmcgKE9wZW5NZWRpYVZhdWx0IHBhY2thZ2VzIGFy +Y2hpdmUpIDxwYWNrYWdlc0BvcGVubWVkaWF2YXVsdC5vcmc+iQI3BBMBCgAhBQJX +hW/zAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJECSGPwxxa5gL918QANOK +puxT4TldSj9422H/U9qjJrjCkr0NUQ4viL+jPhbkz2RwIdWr0hbb1QIb+VTOCZki +eL54I6pEdnDHrxVNxwH9jL5N6vkaZ1prau4tTBh2agS3r/mOeocPIwXJQq3ovmyo +XoF+B0UeXtLmXDCKjt1/rGsyQXTzjXDyL7+PcyKV3+JZfNlgspIRkabG2KYnvsOp +w7kjdiSVqxId4Abq/+0vBRoJEaE0Z5zh1TRYpiutWPRh3aOJDfRJUJOr29YeW60U +beuO+RkvamIQANd0ZVFD22srC/8HkLYzyU89TJxIwuOP5bkCfXUUBTrmp/K4notg +wHKu7CuIzYhfVLXehrRqXi5OUplCqK7oHrxwekMA+BAlkQQ+z13Abgnbc+VKzizn +Lu0p6f/Tli212CB1elARVRZ31rE1CdDLItqdRvAtVUjcmdsoSluc2/OCIG8UgSQN +h+I+cWXMzj7PR8BGPDV92raPgA5drwzJaHuiwhitjHvJEjMzumdtFLpg+auzd7MZ +di8qIKWi2+UuhmR0ljGquO37HvnOzYBtmIewVSl71Lqvg2RVeGPQ72khhS3f96fg +V+/s8cHN6u6OP9iXAafoWcbG4IPdYryRbX7ZN0Jo92s5yTFDe8+MqAvpwMIjRa+U +il/PRwJiht/0fKAlUkxQbu0Sq/nqUdD15Z7FdsmYuQINBFeFb/MBEAC8IYzMXskw +qulpjNZwF7tG9IxqZ0bH9dwP3X9BXD/4ZNjRjX4ER/RsrCqKC7C0hjGjm8j8Hl7e +1Ru1zOM+zfOsm9rvR8zvo/EbU1SHqkJvpcOLq8w0Bo8e+ekJA01QtjhaQHggD5Uk +8tZvR7Bl9+bkytXQ25G6bbgy3pROzgdzFXIZTCcY9Fk6g+OJ23RNRDHSnGc62tNs +9mdmhKlCRp/awOxrKYIE+akmFreYSZ3Lwg1MkvHQtjwzHtDeOHXWiSpV2WPc2cwt +dkSKekevYm9NX+NfhfcAkp6oe3qt9XJa82yAy/fOpdKXanfhHuH5U0tnawwaaYSZ +kSPVDJpL6nArP/fSU6px0n4Gc6L0c7a8weuKq9jFOq75A2KL8GTymMhQks8TJRfB +/awNHYQFIPjA7htVvFWGU2DkkLsWXTo7qGzNHbALvL623vXX6LHsxuZv+9B5Ll9B +xlOrifotAfKhSFBtPF9lCyhH/BGpB7kcmf6Y5rCleyyppgxmKoID0i/jhjD28f8H +n1IitXfNuzcHQcJaMsOrUN++n3q+h9na5Y5OwFTAFY5d8553z+AV9L0zcJ/FYlIi +TAGh15J8Pq3lCnf09BhJ76tZGpW8uNKfH0FKlRBSDzu3ot8snAHjNmnO4ccpll8q +XXDetfvdM7aUVsv8SjffOjrPpLZFH8IchwARAQABiQIfBBgBCgAJBQJXhW/zAhsM +AAoJECSGPwxxa5gLm1cQAJ7Ohemd3jsT3YCfgHib1gUm1kS7TIrxnWiP4RmJ7eqm +m2tdYeRUtZnuShETeXVFLPYrPTMB79JMRZquSsjtgVWR39Q5n6bun4teSGJQbsDV +1YNuzAHMRHSpelJGPgOP+jKKu/y/AmJx5YhJGdg0O5rPFfEFHfMQp4EfU6FA7vRb +bz+65GcDN0SL+mM3/fn89dcgwve+g/VWN3k+W49+Lxm/FNzXm+vc2GlIG//UE2b8 +FOJIudWZIs1XaWbOUgQq08y9GQP2+8ah2vOu2wmHRM7Oupy/WvSEvV3BzwkVh4m+ +BUbYJvwnv5EQUzvlau5xDyQu8R9FYQfUm6ZnASEibsdwSZEn5FBUNJE5LR3qJjeM +KScnWpvhEzmwuLiGmm1QgehWWnXa8tbN+eDdP/WGeI1zzI07YR9MqAQDgPSwwlOc +X5IDSctpNI2aTHVxLl3AF0oywK/RMevWw9je5Fv39y06TcE4h2sFd82tnwtSt9U8 +AGE7Jyh99haXD5NlgCGC4zsoXxcwxDLk4ffiRwiCgEbO6xghmTtLTyaJqTuK9QRQ +p050bDtquyNjGwaVRvhzfkoSCPM0frnxetov0r/7klCUMphCDouAUo4yw+OZm1as +onscCwxOpiWYFs7q2HcwvNlXZdGvDzFaFKXtxR5gslYsXyhGRNGJGpdTBgzXhY91 +=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 new file mode 100644 index 0000000..ae18bf2 --- /dev/null +++ b/configs/debian-buster-openmediavault/archives/omv.list.chroot @@ -0,0 +1 @@ +deb http://packages.openmediavault.org/public/ usul main diff --git a/configs/debian-stretch-openmediavault/hooks/95-install-omv.chroot b/configs/debian-buster-openmediavault/hooks/95-install-omv.chroot similarity index 90% rename from configs/debian-stretch-openmediavault/hooks/95-install-omv.chroot rename to configs/debian-buster-openmediavault/hooks/95-install-omv.chroot index fe9dcf7..718a6dc 100644 --- a/configs/debian-stretch-openmediavault/hooks/95-install-omv.chroot +++ b/configs/debian-buster-openmediavault/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/configs/debian-stretch-openmediavault/package-lists/extra.list.chroot b/configs/debian-buster-openmediavault/package-lists/extra.list.chroot similarity index 100% rename from configs/debian-stretch-openmediavault/package-lists/extra.list.chroot rename to configs/debian-buster-openmediavault/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 deleted file mode 100644 index f159479..0000000 --- a/configs/debian-stretch-openmediavault/archives/omv.key.chroot +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.9 (GNU/Linux) - -mQGiBEuc8QARBADukrjoPyHkmxyCnDTl+9WA+ThdAvLrkyneXMh6QsEILiy8Xj5m -gTH/xYfT3tkINCV1fvJAJFQyzbdnraxj3HFw6pD5M7xOuU6yOVeisOufRLsb7+wh -o9S+538YTOEQhGoA+lAZ/beMLFbP+IJs768G2q0z0RSTJI65wIgTF4zy4wCgpN3t -RCwjl+NhMtV26Q+DgMLxeLEEANyBZnBilqFxSTNCPsMsaJ3bcT22FoJIhFL18W70 -BwGfSYipudg+/n98Rf+swHj3jqhe6GXo/azui+H/yADVB5wCgRxK2SqqpUTapT25 -lbgK0IuR0uNWKq0frfZDeZVdRF/Igf+U0ieXu0nUgEDp6mJAQ3bUF3b0u8+lk4hl -Z2S2A/0WAzjFIQFCeGof/dY1zEFl2YB9hZdMsfpB73fmvFWWePSyT2Wbx4bnV2GM -7DCgc+Jb7KZfYRxVTX+WapW13O6jKn9vaY1XkSrtcF1YKecNsJ0QYGwZA4clrFgU -DmmdInItOMtcOk2ZkI0g6Ul+zMzHLdHBAYzah4JcXu3FD0o1qrRST3Blbk1lZGlh -VmF1bHQub3JnIChPcGVuTWVkaWFWYXVsdCBwYWNrYWdlcyBhcmNoaXZlKSA8cGFj -a2FnZXNAb3Blbm1lZGlhdmF1bHQub3JnPohgBBMRAgAgBQJLnPEAAhsDBgsJCAcD -AgQVAggDBBYCAwECHgECF4AACgkQfnpsWS7zXRMauQCfeeASCpE9FRlT0RvmruTo -CdvknmMAnAj3z0qZ8FRDlxDq5/ZZpRV0ZufRuQINBEuc8QAQCACbgg+6SpaKvXD0 -p9uEYjoFZkIeEsJ+TzPfllUZusDQDOi8JLHkh954uRjjsG75QGG2ReRCVVtzlX5r -GDT6E4dz8W7PJ/mreyAxbNcdrpHF58ytidXtisjlCQEwxd+iKGDbRs9eCW6LR9JT -RNWMLW2V2SU56/kHz583RqoKXMHwgKL9o/3+Iz2vQ81C5b9fr1R7ehGn4umwaJFl -5nQmUcOdRzAM+m1QYFx6nBYeqT4ChW6nQ16h8OelJv0L6Ojp1T+c5zdKXmo/gwr4 -PpFSvQygpnctfSelM7o2SRtsOg51KLFD/2eGg3zWuO9u5IK5fJXRpgo6DKJc81FJ -tPlq9qbnAAMFCACavPO8fUECEANa82pO0tmAmr7Hgeie1TnATYkcHeEZqtfnzzrZ -B8Cf47cryIRijLSWoBTTqU+l73dDTdaoR9eY+LNCI7ATHHL/szcJ53ckOF/811aV -z8/ACB1bAlboaMYGPHpi+r/2FhQxnTEN/3/MCJGtjU23oYm6wE8AAQ4PzsSGaxPp -HkEuUOaV1bl4IuXkhVzmt5hH6liID79BzhIItgzuhHXo14fQcqVL2jcoH0/VY+Ki -luKyA17jyIfDSJF0FAidp7QhddDwRW5EdznXdJsF0zQOfpnTPjIW9I2eLhmDP/Sr -MVJOXKzZMZPXKO+57QMPiEv3aNtYsNZtikXAiEkEGBECAAkFAkuc8QACGwwACgkQ -fnpsWS7zXRNLMQCfcQW5ZVbLf4+O91joWpJ8GFGJXdcAn09vfHNwwgPkTFBQOMew -s6KUVxiM -=mF0t ------END PGP PUBLIC KEY BLOCK----- diff --git a/configs/debian-stretch-openmediavault/archives/omv.list.chroot b/configs/debian-stretch-openmediavault/archives/omv.list.chroot deleted file mode 100644 index 35f1d0e..0000000 --- a/configs/debian-stretch-openmediavault/archives/omv.list.chroot +++ /dev/null @@ -1 +0,0 @@ -deb http://packages.openmediavault.org/public/ arrakis main diff --git a/configs/ubuntu-bionic-i3/package-lists/i3.list.chroot b/configs/ubuntu-bionic-i3/package-lists/i3.list.chroot deleted file mode 100644 index 34de9dc..0000000 --- a/configs/ubuntu-bionic-i3/package-lists/i3.list.chroot +++ /dev/null @@ -1,10 +0,0 @@ -xserver-xorg-input-all -xfonts-base -slim -rxvt-unicode-lite -i3 -i3status -i3lock -suckless-tools -network-manager -pulseaudio diff --git a/configs/ubuntu-bionic-mate/.gitkeep b/configs/ubuntu-bionic-mate/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/configs/ubuntu-bionic-mate/package-lists/apps.list.chroot b/configs/ubuntu-bionic-mate/package-lists/apps.list.chroot deleted file mode 100644 index 89a0958..0000000 --- a/configs/ubuntu-bionic-mate/package-lists/apps.list.chroot +++ /dev/null @@ -1,10 +0,0 @@ -aisleriot -geany -gnome-mines -gnome-sudoku -mplayer -scratch -smplayer -smplayer-themes -smtube -chromium-browser diff --git a/configs/ubuntu-bionic-minimal/.gitkeep b/configs/ubuntu-bionic-minimal/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/configs/ubuntu-disco-mate/.gitkeep b/configs/ubuntu-disco-mate/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/configs/ubuntu-disco-mate/package-lists/apps.list.chroot b/configs/ubuntu-disco-mate/package-lists/apps.list.chroot deleted file mode 100644 index 89a0958..0000000 --- a/configs/ubuntu-disco-mate/package-lists/apps.list.chroot +++ /dev/null @@ -1,10 +0,0 @@ -aisleriot -geany -gnome-mines -gnome-sudoku -mplayer -scratch -smplayer -smplayer-themes -smtube -chromium-browser diff --git a/configs/ubuntu-disco-mate/package-lists/mate.list.chroot b/configs/ubuntu-disco-mate/package-lists/mate.list.chroot deleted file mode 100644 index 9f9ca9e..0000000 --- a/configs/ubuntu-disco-mate/package-lists/mate.list.chroot +++ /dev/null @@ -1,5 +0,0 @@ -ubuntu-mate-core -ubuntu-mate-desktop -ubuntu-mate-lightdm-theme -ubuntu-mate-wallpapers-xenial -lightdm diff --git a/configs/ubuntu-disco-minimal/.gitkeep b/configs/ubuntu-disco-minimal/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/configs/debian-stretch-minimal/.gitkeep b/configs/ubuntu-focal-mate/.gitkeep similarity index 100% rename from configs/debian-stretch-minimal/.gitkeep rename to configs/ubuntu-focal-mate/.gitkeep diff --git a/configs/ubuntu-bionic-i3/package-lists/apps.list.chroot b/configs/ubuntu-focal-mate/package-lists/apps.list.chroot similarity index 100% rename from configs/ubuntu-bionic-i3/package-lists/apps.list.chroot rename to configs/ubuntu-focal-mate/package-lists/apps.list.chroot diff --git a/configs/ubuntu-bionic-mate/package-lists/mate.list.chroot b/configs/ubuntu-focal-mate/package-lists/mate.list.chroot similarity index 100% rename from configs/ubuntu-bionic-mate/package-lists/mate.list.chroot rename to configs/ubuntu-focal-mate/package-lists/mate.list.chroot diff --git a/configs/ubuntu-bionic-i3/.gitkeep b/configs/ubuntu-focal-minimal/.gitkeep similarity index 100% rename from configs/ubuntu-bionic-i3/.gitkeep rename to configs/ubuntu-focal-minimal/.gitkeep