From 84f5c379a6d9a5f1bdf3b09dce23b84af9193a3f Mon Sep 17 00:00:00 2001 From: Hakuna Matata Date: Mon, 10 Oct 2016 22:53:39 +0200 Subject: [PATCH] Update download links and README --- README | 13 +++++-- data/isolist.ini | 94 ++++++++++++++++++++++++------------------------ debian/changelog | 7 ++++ 3 files changed, 64 insertions(+), 50 deletions(-) diff --git a/README b/README index 24aa5c22..59e28df7 100644 --- a/README +++ b/README @@ -7,8 +7,7 @@ to a normal installation. For more information see: -http://wubi-installer.org -http://wiki.ubuntu.com/WubiGuide +https://github.com/hakuna-m/wubiuefi/wiki == Compiling == @@ -22,6 +21,12 @@ confirm all the default choices in the installation screens that will appear. Inside of Windows, unzip the archive, then run "python.exe main.py --verbose". You can edit any file inside of ./lib. * make pot: generates a gettext template (po/wubi.pot) + * make check_wine: creates the Wine environment if it doesn't exist. + * make check_winboot: creates the environment for building and signing + boot loaders if it doesn't exist. + * make winboot: creates the boot loader files + * make clean: removes built files + * make distclean: removes built files and environment == Code overview == @@ -45,7 +50,7 @@ stage) Wubi performs the following tasks - * feteches information about the running system which will be used + * fetches information about the running system which will be used during installation * checks that the minimum installation requirements are met * retrieves required user information via a GUI @@ -69,6 +74,8 @@ particular it must have .disk/info formatted like .disk/info in the Ubuntu ISO * you must provide a webserver with metalink file, metalink file md5 checksums and signatures for the md5 sums * add your signing key to data/trustedkeys.gpg + * replace the generated dummy keys in .key with your signing keys for + Secure Boot * on the linux side, the distribution must be capable of booting and rebooting off a loop file, perform an automatic installation and accept the special boot parameters that indicate the local preseed file and ISO diff --git a/data/isolist.ini b/data/isolist.ini index f7903a82..ca7950e7 100644 --- a/data/isolist.ini +++ b/data/isolist.ini @@ -20,7 +20,7 @@ installation_dir=ubuntu arch=i386 name=Ubuntu packages=ubuntu-desktop -metalink=http://releases.ubuntu.com/16.10/ubuntu-16.10-beta2-desktop-i386.metalink +metalink=http://releases.ubuntu.com/16.10/ubuntu-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/daily-live/current/yakkety-desktop-i386.metalink website=http://www.ubuntu.com ordering=1 @@ -30,7 +30,7 @@ arch=amd64 name=Ubuntu packages=ubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://releases.ubuntu.com/16.10/ubuntu-16.10-beta2-desktop-amd64.metalink +metalink=http://releases.ubuntu.com/16.10/ubuntu-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/daily-live/current/yakkety-desktop-amd64.metalink website=http://www.ubuntu.com ordering=1 @@ -39,7 +39,7 @@ ordering=1 arch=i386 name=Ubuntu GNOME packages=ubuntu-gnome-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/16.10/beta-2/ubuntu-gnome-16.10-beta2-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/16.10/release/ubuntu-gnome-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/ubuntu-gnome/daily-live/current/yakkety-desktop-i386.metalink website=http://www.ubuntugnome.org ordering=2 @@ -49,7 +49,7 @@ arch=amd64 name=Ubuntu GNOME packages=ubuntu-gnome-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/16.10/beta-2/ubuntu-gnome-16.10-beta2-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/16.10/release/ubuntu-gnome-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/ubuntu-gnome/daily-live/current/yakkety-desktop-amd64.metalink website=http://www.ubuntugnome.org ordering=2 @@ -58,7 +58,7 @@ ordering=2 arch=i386 name=Kubuntu packages=kubuntu-desktop -metalink=http://cdimage.ubuntu.com/kubuntu/releases/16.10/beta-2/kubuntu-16.10-beta2-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/kubuntu/releases/16.10/release/kubuntu-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/yakkety-desktop-i386.metalink website=http://www.kubuntu.org ordering=3 @@ -68,7 +68,7 @@ arch=amd64 name=Kubuntu packages=kubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/kubuntu/releases/16.10/beta-2/kubuntu-16.10-beta2-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/kubuntu/releases/16.10/release/kubuntu-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/yakkety-desktop-amd64.metalink website=http://www.kubuntu.org ordering=3 @@ -77,7 +77,7 @@ ordering=3 arch=i386 name=Xubuntu packages=xubuntu-desktop -metalink=http://cdimage.ubuntu.com/xubuntu/releases/16.10/beta-2/xubuntu-16.10-beta2-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/xubuntu/releases/16.10/release/xubuntu-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/xubuntu/daily-live/current/yakkety-desktop-i386.metalink website=http://www.xubuntu.org ordering=4 @@ -87,29 +87,29 @@ arch=amd64 name=Xubuntu packages=xubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/xubuntu/releases/16.10/beta-2/xubuntu-16.10-beta2-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/xubuntu/releases/16.10/release/xubuntu-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/xubuntu/daily-live/current/yakkety-desktop-amd64.metalink website=http://www.xubuntu.org ordering=4 - -[Mythbuntu-i386] -arch=i386 -name=Mythbuntu -packages=ubuntu-standard -metalink=http://cdimage.ubuntu.com/mythbuntu/releases/16.10/beta-2/mythbuntu-16.10-beta2-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/yakkety-desktop-i386.metalink -website=http://www.mythbuntu.org -ordering=5 - -[Mythbuntu-amd64] -arch=amd64 -name=Mythbuntu -packages=ubuntu-standard -kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/mythbuntu/releases/16.10/beta-2/mythbuntu-16.10-beta2-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/yakkety-desktop-amd64.metalink -website=http://www.mythbuntu.org -ordering=5 +# -- no Mythbuntu release for 16.10 -- +#[Mythbuntu-i386] +#arch=i386 +#name=Mythbuntu +#packages=ubuntu-standard +#metalink=http://cdimage.ubuntu.com/mythbuntu/releases/16.10/release/mythbuntu-16.10-desktop-i386.metalink +#metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/yakkety-desktop-i386.metalink +#website=http://www.mythbuntu.org +#ordering=5 +# +#[Mythbuntu-amd64] +#arch=amd64 +#name=Mythbuntu +#packages=ubuntu-standard +#kernel=casper/vmlinuz.efi +#metalink=http://cdimage.ubuntu.com/mythbuntu/releases/16.10/release/mythbuntu-16.10-desktop-amd64.metalink +#metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/yakkety-desktop-amd64.metalink +#website=http://www.mythbuntu.org +#ordering=5 # -- no Edubuntu release for 16.10 -- #[Edubuntu-i386] #min_iso_size=1500000000 @@ -119,7 +119,7 @@ ordering=5 #arch=i386 #name=Edubuntu #packages=edubuntu-desktop -#metalink=http://cdimage.ubuntu.com/edubuntu/releases/16.10/beta-2/edubuntu-16.10-beta2-dvd-i386.metalink +#metalink=http://cdimage.ubuntu.com/edubuntu/releases/16.10/release/edubuntu-16.10-dvd-i386.metalink #metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/yakkety-dvd-i386.metalink #website=http://www.edubuntu.org #ordering=6 @@ -133,7 +133,7 @@ ordering=5 #name=Edubuntu #packages=edubuntu-desktop #kernel=casper/vmlinuz.efi -#metalink=http://cdimage.ubuntu.com/edubuntu/releases/16.10/beta-2/edubuntu-16.10-beta2-dvd-amd64.metalink +#metalink=http://cdimage.ubuntu.com/edubuntu/releases/16.10/release/edubuntu-16.10-dvd-amd64.metalink #metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/yakkety-dvd-amd64.metalink #website=http://www.edubuntu.org #ordering=6 @@ -142,7 +142,7 @@ ordering=5 arch=i386 name=Lubuntu packages=lubuntu-desktop -metalink=http://cdimage.ubuntu.com/lubuntu/releases/16.10/beta-2/lubuntu-16.10-beta2-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/lubuntu/releases/16.10/release/lubuntu-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/yakkety-desktop-i386.metalink website=http://lubuntu.net ordering=7 @@ -152,7 +152,7 @@ arch=amd64 name=Lubuntu packages=lubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/lubuntu/releases/16.10/beta-2/lubuntu-16.10-beta2-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/lubuntu/releases/16.10/release/lubuntu-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/yakkety-desktop-amd64.metalink website=http://lubuntu.net ordering=7 @@ -165,7 +165,7 @@ min_memory_mb=512 arch=i386 name=Ubuntu Studio packages=ubuntustudio-desktop -metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/16.10/beta-2/ubuntustudio-16.10-beta2-dvd-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/16.10/release/ubuntustudio-16.10-dvd-i386.metalink metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/yakkety-dvd-i386.metalink website=http://ubuntustudio.org ordering=8 @@ -178,7 +178,7 @@ min_memory_mb=512 arch=amd64 name=Ubuntu Studio packages=ubuntustudio-desktop -metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/16.10/beta-2/ubuntustudio-16.10-beta2-dvd-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/16.10/release/ubuntustudio-16.10-dvd-amd64.metalink metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/yakkety-dvd-amd64.metalink website=http://ubuntustudio.org ordering=8 @@ -187,7 +187,7 @@ ordering=8 arch=i386 name=Ubuntu MATE packages=ubuntu-mate-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/16.10/beta-2/ubuntu-mate-16.10-beta2-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/16.10/release/ubuntu-mate-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/ubuntu-mate/daily-live/current/yakkety-desktop-i386.metalink website=http://ubuntu-mate.org/ ordering=9 @@ -197,7 +197,7 @@ arch=amd64 name=Ubuntu MATE packages=ubuntu-mate-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/16.10/beta-2/ubuntu-mate-16.10-beta2-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/16.10/release/ubuntu-mate-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/ubuntu-mate/daily-live/current/yakkety-desktop-amd64.metalink website=http://ubuntu-mate.org ordering=9 @@ -206,7 +206,7 @@ ordering=9 arch=i386 name=Ubuntu Kylin packages=ubuntukylin-desktop -metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/16.10/beta-2/ubuntukylin-16.10-beta2-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/16.10/release/ubuntukylin-16.10-desktop-i386.metalink metalink2=http://cdimage.ubuntu.com/ubuntukylin/daily-live/current/yakkety-desktop-i386.metalink website=http://www.ubuntukylin.com ordering=A @@ -216,7 +216,7 @@ arch=amd64 name=Ubuntu Kylin packages=ubuntukylin-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/16.10/beta-2/ubuntukylin-16.10-beta2-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/16.10/release/ubuntukylin-16.10-desktop-amd64.metalink metalink2=http://cdimage.ubuntu.com/ubuntukylin/daily-live/current/yakkety-desktop-amd64.metalink website=http://www.ubuntukylin.com ordering=A @@ -226,7 +226,7 @@ version= arch=i386 name=Wubi packages= -metalink=16.10-beta2-desktop-i386.metalink +metalink=16.10-desktop-i386.metalink metalink2=yakkety-desktop-i386.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -237,7 +237,7 @@ version= arch=amd64 name=Wubi packages= -metalink=16.10-beta2-desktop-amd64.metalink +metalink=16.10-desktop-amd64.metalink metalink2=yakkety-desktop-amd64.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -249,7 +249,7 @@ arch=i386 name=Wubi EFI packages= kernel=casper/vmlinuz.efi -metalink=16.10-beta2-desktop-i386.metalink +metalink=16.10-desktop-i386.metalink metalink2=yakkety-desktop-i386.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -261,7 +261,7 @@ arch=amd64 name=Wubi EFI packages= kernel=casper/vmlinuz.efi -metalink=16.10-beta2-desktop-amd64.metalink +metalink=16.10-desktop-amd64.metalink metalink2=yakkety-desktop-amd64.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -273,7 +273,7 @@ arch=i386 name=Wubi MD5 packages= md5sums=MD5SUMS -metalink=16.10-beta2-desktop-i386.metalink +metalink=16.10-desktop-i386.metalink metalink2=yakkety-desktop-i386.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -285,7 +285,7 @@ arch=amd64 name=Wubi MD5 packages= md5sums=MD5SUMS -metalink=16.10-beta2-desktop-amd64.metalink +metalink=16.10-desktop-amd64.metalink metalink2=yakkety-desktop-amd64.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -297,7 +297,7 @@ arch=i386 name=Wubi gz packages= initrd=casper/initrd.gz -metalink=16.10-beta2-desktop-i386.metalink +metalink=16.10-desktop-i386.metalink metalink2=yakkety-desktop-i386.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -310,7 +310,7 @@ name=Wubi gz packages= initrd=casper/initrd.gz kernel=casper/vmlinuz.efi -metalink=16.10-beta2-desktop-amd64.metalink +metalink=16.10-desktop-amd64.metalink metalink2=yakkety-desktop-amd64.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -322,7 +322,7 @@ arch=i386 name=Wubi SHA256 packages= md5sums=SHA256SUMS -metalink=16.10-beta2-desktop-i386.metalink +metalink=16.10-desktop-i386.metalink metalink2=yakkety-desktop-i386.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki @@ -334,7 +334,7 @@ arch=amd64 name=Wubi SHA256 packages= md5sums=SHA256SUMS -metalink=16.10-beta2-desktop-amd64.metalink +metalink=16.10-desktop-amd64.metalink metalink2=yakkety-desktop-amd64.metalink website=https://github.com/hakuna-m/wubiuefi support=https://github.com/hakuna-m/wubiuefi/wiki diff --git a/debian/changelog b/debian/changelog index 24c1b5df..ec4de256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wubi (16.10r315) yakkety; urgency=low + + [Hakuna Matata] + + * Links for final release, remove Mythbuntu 16.10 + * Improve and update README file + wubi (16.10r314) yakkety; urgency=low [Hakuna Matata]