Update and bump compatibility to 20.04.5 and 20.04.6

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+name: Build Wubi
+
+on:
+  workflow_dispatch:
+    inputs:
+      packages:
+        description: "URLs to additional packages to be included"
+        required: false
+
+jobs:
+  Build-Wubi-2004:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install -y git make gettext unzip wget wine32:i386
+
+      - name: Checkout
+        uses: actions/checkout@v3.6.0
+
+      - name: Get additional packages
+        run: |
+          if [ -n "${{ github.event.inputs.packages }}" ]; then
+          wget -P ${{ github.workspace }}/data/custom-installation/packages ${{ github.event.inputs.packages }}
+          fi
+
+      - name: Build
+        run: |
+          cd ${{ github.workspace }}
+          make
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: wubi20046r344.exe
+          path: ${{ github.workspace }}/build/wubi.exe

data/isolist.ini

@@ -16,167 +16,85 @@ support=http://www.ubuntu.com/support
 installation_dir=ubuntu
 #NOTE: installation_dir must also be changed in data/wubildr.cfg
 
-[Ubuntu-i386]
-max_iso_size=1700000000
-arch=i386
-name=Ubuntu
-packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-i386.list
-website=http://www.ubuntu.com
-ordering=1
-
 [Ubuntu-amd64]
 max_iso_size=1700000000
 arch=amd64
 name=Ubuntu
 packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://releases.ubuntu.com/20.04.6/ubuntu-20.04.6-desktop-amd64.list
+metalink2=
 website=http://www.ubuntu.com
 ordering=1
 
-[Kubuntu-i386]
-max_iso_size=1800000000
-arch=i386
-name=Kubuntu
-packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.4/release/kubuntu-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/kubuntu/focal/daily-live/pending/focal-desktop-i386.list
-website=http://www.kubuntu.org
-ordering=3
-
 [Kubuntu-amd64]
 max_iso_size=1800000000
 arch=amd64
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.4/release/kubuntu-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/kubuntu/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/20.04.6/release/kubuntu-20.04.6-desktop-amd64.list
+metalink2=
 website=http://www.kubuntu.org
 ordering=3
 
-[Xubuntu-i386]
-max_iso_size=1300000000
-arch=i386
-name=Xubuntu
-packages=xubuntu-desktop
-metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.4/release/xubuntu-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/xubuntu/focal/daily-live/pending/focal-desktop-i386.list
-website=http://www.xubuntu.org
-ordering=4
-
 [Xubuntu-amd64]
 max_iso_size=1300000000
 arch=amd64
 name=Xubuntu
 packages=xubuntu-desktop
-metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.4/release/xubuntu-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/xubuntu/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/xubuntu/releases/20.04.6/release/xubuntu-20.04.6-desktop-amd64.list
+metalink2=
 website=http://www.xubuntu.org
 ordering=4
 
-[Ubuntu Budgie-i386]
-max_iso_size=1500000000
-arch=i386
-name=Ubuntu Budgie
-packages=budgie-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.4/release/ubuntu-budgie-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/focal/daily-live/pending/focal-desktop-i386.list
-website=http://ubuntubudgie.org
-ordering=5
-
 [Ubuntu Budgie-amd64]
 max_iso_size=1500000000
 arch=amd64
 name=Ubuntu Budgie
 packages=budgie-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.4/release/ubuntu-budgie-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/ubuntu-budgie/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntu-budgie/releases/20.04.6/release/ubuntu-budgie-20.04.6-desktop-amd64.list
+metalink2=
 website=http://ubuntubudgie.org
 ordering=5
 
-[Lubuntu-i386]
-max_iso_size=1000000000
-arch=i386
-name=Lubuntu
-packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.4/release/lubuntu-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-i386.list
-website=http://lubuntu.net
-ordering=7
-
 [Lubuntu-amd64]
 max_iso_size=1000000000
 arch=amd64
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.4/release/lubuntu-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/lubuntu/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/20.04.5/release/lubuntu-20.04.5-desktop-amd64.list
+metalink2=
 website=http://lubuntu.net
 ordering=7
 
-[Ubuntu Studio-i386]
-max_iso_size=2800000000
-min_disk_space_mb=10000
-min_memory_mb=512
-arch=i386
-name=Ubuntu Studio
-packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.4/release/ubuntustudio-20.04.4-dvd-i386.list
-metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-i386.list
-website=http://ubuntustudio.org
-ordering=8
-
 [Ubuntu Studio-amd64]
 max_iso_size=2800000000
 min_disk_space_mb=10000
 min_memory_mb=512
 arch=amd64
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.4/release/ubuntustudio-20.04.4-dvd-amd64.list
-metalink2=http://cdimage.ubuntu.com/ubuntustudio/focal/dvd/pending/focal-dvd-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/20.04.5/release/ubuntustudio-20.04.5-dvd-amd64.list
+metalink2=
 website=http://ubuntustudio.org
 ordering=8
 
-[Ubuntu MATE-i386]
-max_iso_size=1900000000
-arch=i386
-name=Ubuntu MATE
-packages=ubuntu-mate-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.4/release/ubuntu-mate-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/ubuntu-mate/focal/daily-live/pending/focal-desktop-i386.list
-website=http://ubuntu-mate.org/
-ordering=9
-
 [Ubuntu MATE-amd64]
 max_iso_size=1900000000
 arch=amd64
 name=Ubuntu MATE
 packages=ubuntu-mate-desktop
-metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.4/release/ubuntu-mate-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/ubuntu-mate/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/20.04.6/release/ubuntu-mate-20.04.6-desktop-amd64.list
+metalink2=
 website=http://ubuntu-mate.org
 ordering=9
 
-[Ubuntu Kylin-i386]
-max_iso_size=1600000000
-arch=i386
-name=Ubuntu Kylin
-packages=ubuntukylin-desktop
-metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.4/release/ubuntukylin-20.04.4-desktop-i386.list
-metalink2=http://cdimage.ubuntu.com/ubuntukylin/focal/daily-live/pending/focal-desktop-i386.list
-website=http://www.ubuntukylin.com
-ordering=A
-
 [Ubuntu Kylin-amd64]
 max_iso_size=1600000000
 arch=amd64
 name=Ubuntu Kylin
 packages=ubuntukylin-desktop
-metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.4/release/ubuntukylin-20.04.4-desktop-amd64.list
-metalink2=http://cdimage.ubuntu.com/ubuntukylin/focal/daily-live/pending/focal-desktop-amd64.list
+metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/20.04.6/release/ubuntukylin-20.04.6-desktop-amd64.list
+metalink2=
 website=http://www.ubuntukylin.com
 ordering=A
 
@@ -185,7 +103,7 @@ version=
 arch=i386
 name=Wubi
 packages=
-metalink=20.04.4-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -196,7 +114,7 @@ version=
 arch=amd64
 name=Wubi
 packages=
-metalink=20.04.4-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -208,7 +126,7 @@ arch=i386
 name=Wubi lz
 packages=
 initrd=casper/initrd.lz
-metalink=20.04.4-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -220,7 +138,7 @@ arch=amd64
 name=Wubi lz
 packages=
 initrd=casper/initrd.lz
-metalink=20.04.4-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -233,7 +151,7 @@ name=Wubi EFI
 packages=
 kernel=casper/vmlinuz.efi
 initrd=casper/initrd.lz
-metalink=20.04.4-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -246,7 +164,7 @@ name=Wubi EFI
 packages=
 kernel=casper/vmlinuz.efi
 initrd=casper/initrd.lz
-metalink=20.04.4-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -259,7 +177,7 @@ name=Wubi MD5
 packages=
 initrd=casper/initrd.lz
 md5sums=MD5SUMS
-metalink=20.04.4-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -272,7 +190,7 @@ name=Wubi MD5
 packages=
 initrd=casper/initrd.lz
 md5sums=MD5SUMS
-metalink=20.04.4-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -284,7 +202,7 @@ arch=i386
 name=Wubi gz
 packages=
 initrd=casper/initrd.gz
-metalink=20.04.4-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -296,7 +214,7 @@ arch=amd64
 name=Wubi gz
 packages=
 initrd=casper/initrd.gz
-metalink=20.04.4-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -309,7 +227,7 @@ name=Wubi SHA256
 packages=
 initrd=casper/initrd.lz
 md5sums=SHA256SUMS
-metalink=20.04.4-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -322,7 +240,7 @@ name=Wubi SHA256
 packages=
 initrd=casper/initrd.lz
 md5sums=SHA256SUMS
-metalink=20.04.4-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 
 website=https://github.com/hakuna-m/wubiuefi
@@ -335,7 +253,7 @@ arch=i386
 name=Wubi lz4
 packages=
 initrd=casper/initrd.lz4
-metalink=20.04-desktop-i386.list
+metalink=20.04.6-desktop-i386.list
 metalink2=focal-desktop-i386.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
@@ -347,8 +265,32 @@ arch=amd64
 name=Wubi lz4
 packages=
 initrd=casper/initrd.lz4
-metalink=20.04-desktop-amd64.list
+metalink=20.04.6-desktop-amd64.list
 metalink2=focal-desktop-amd64.list
 website=https://github.com/hakuna-m/wubiuefi
 support=https://github.com/hakuna-m/wubiuefi/wiki
 ordering=a
+
+[Wubi zstd-i386]
+version=
+arch=i386
+name=Wubi zstd
+packages=
+initrd=casper/initrd.zstd
+metalink=20.04.6-desktop-i386.list
+metalink2=focal-desktop-i386.list
+website=https://github.com/hakuna-m/wubiuefi
+support=https://github.com/hakuna-m/wubiuefi/wiki
+ordering=b
+
+[Wubi zstd-amd64]
+version=
+arch=amd64
+name=Wubi zstd
+packages=
+initrd=casper/initrd.zstd
+metalink=20.04.6-desktop-amd64.list
+metalink2=focal-desktop-amd64.list
+website=https://github.com/hakuna-m/wubiuefi
+support=https://github.com/hakuna-m/wubiuefi/wiki
+ordering=b

debian/changelog

@@ -1,3 +1,13 @@
+wubi (20.04.6r344) focal; urgency=low
+
+  [Niktendo]
+
+  * Bump to 20.04.5 and 20.04.6
+  * Removed offical i386 editions as they are not available anymore
+  * Removed daily focal filelists cause they are are deprecated
+  * Fix metalinks for Wubi lz4-i386 and Wubi lz4-amd64
+  * new desktop environment "Wubi zstd"
+
 wubi (20.04.4r344) focal; urgency=low
 
   [Hakuna Matata]