Merge ~mikbuch/ubuntu/+source/ubuntu-release-upgrader:ubuntu/impish into ubuntu/+source/ubuntu-release-upgrader:ubuntu/impish

[Mikolaj Buchwald]

Bug #1975533 support for upgrading from Groovy to Impish

As Brain Murray suggested, I added `DistUpgrade.cfg.groovy` and `demoted.cfg.groovy` (see https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1975533).

[Brian Murray (brian-murray)]

Thanks for working on this, I'll get it merged and uploaded shortly.

[Mikolaj Buchwald (mikbuch)]

No problem, I'm glad I could help. Keep the good work with the upgrader going!

[Brian Murray (brian-murray)]

The correct target branch for the fix would have been the following:

https://code.launchpad.net/~ubuntu-core-dev/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+ref/ubuntu/impish

I made the changes here:

https://git.launchpad.net/ubuntu-release-upgrader/commit/?id=b5454f613a2c434a16944c20542dcff80a8c862e

review: Disapprove

[Mikolaj Buchwald (mikbuch)]

My bad, wrong branch. Thank you for the commit to the proper branch.

Unmerged commits

c142cd1... by Mikolaj Buchwald on 2022-06-23

#1975533 Support for upgrading Ubuntu Groovy to Impish

diff --git a/data/DistUpgrade.cfg.groovy b/data/DistUpgrade.cfg.groovy
new file mode 100644
index 0000000..6e0c3b2
--- /dev/null
+++ b/data/DistUpgrade.cfg.groovy
@@ -0,0 +1,131 @@
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= apt (>= 1.0.10.2ubuntu2)
+# the views below support upgrades over ssh connection
+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
+
+# Distro contains global information about the upgrade
+[Distro]
+# the meta-pkgs we support
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
+   xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
+   kubuntu-netbook, lubuntu-desktop, ubuntu-gnome-desktop,
+   ubuntu-mate-core, ubuntu-mate-desktop,
+   ubuntukylin-desktop, ubuntu-budgie-desktop
+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
+# minimal & standard, are handed via BaseMetaPkgs rule
+# ubuntu-core is left-over task we forgot to remove
+IgnoredTasks=minimal, standard, ubuntu-core
+Demotions=demoted.cfg.focal
+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
+RemovalBlacklistFile=removal_blacklist.cfg
+# if those packages were installed, make sure to keep them installed
+KeepInstalledPkgs=xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+PurgeObsoletes=yes
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
+# hints for for stuff that should be done right after the cache calculated
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradeInstall=apt
+PostInstallScripts=./xorg_fix_proprietary.py
+EnableApport=yes
+# this supported blacklisting certain versions to ensure we do not upgrade
+#  - blcr-dkms fails to build on kernel 2.6.35
+#BadVersions=blcr-dkms_0.8.2-13
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+# information about the individual meta-pkgs
+[ubuntu-desktop]
+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
+
+[kubuntu-desktop]
+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
+# those packages are marked as obsolete right after the upgrade
+ForcedObsoletes=ivman, gtk-qt-engine
+# help the resolver a bit: LP: #1426132
+PostUpgradeInstall=baloo-kf5
+
+[kubuntu-netbook]
+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
+
+[ubuntu-netbook]
+KeyDependencies=gdm, ubuntu-netbook-default-settings
+
+[xubuntu-core]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[xubuntu-desktop]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[ubuntustudio-desktop]
+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
+
+[ichthux-desktop]
+KeyDependencies=ichthux-artwork, ichthux-default-settings
+
+[mythbuntu-desktop]
+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
+
+[lubuntu-desktop]
+KeyDependencies=lubuntu-artwork, lubuntu-default-settings
+
+[ubuntu-gnome-desktop]
+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
+
+[ubuntu-mate-core]
+KeyDependencies=mate-desktop-environment-core, ubuntu-mate-default-settings, marco
+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
+
+[ubuntu-mate-desktop]
+KeyDependencies=ubuntu-mate-core, deja-dup-caja
+PostUpgradeRemove=ibus,lightdm-gtk-greeter,lightdm-gtk-greeter-settings
+
+[ubuntukylin-desktop]
+KeyDependencies=ubuntukylin-keyring, ubuntukylin-wallpapers, ubuntu-kylin-docs
+
+[ubuntu-budgie-desktop]
+KeyDependencies=budgie-desktop-environment, budgie-welcome, ubuntu-budgie-themes
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=groovy
+To=impish
+ValidOrigin=Ubuntu
+ValidMirrors = mirrors.cfg
+Components=main,restricted,universe,multiverse
+Pockets=security,updates,proposed,backports
+;AllowThirdParty=False
+
+;[PreRequists]
+;Packages=release-upgrader-apt,release-upgrader-dpkg
+;SourcesList=prerequists-sources.list
+;SourcesList-ia64=prerequists-sources.ports.list
+;SourcesList-hppa=prerequists-sources.ports.list
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400
diff --git a/data/demoted.cfg.groovy b/data/demoted.cfg.groovy
new file mode 100644
index 0000000..db31d5b
--- /dev/null
+++ b/data/demoted.cfg.groovy
@@ -0,0 +1,190 @@
+# demoted packages from focal to impish
+apparmor-notify
+appstream-doc
+appstream-glib-doc
+apt-clone
+at
+cpp-9
+cpp-9-aarch64-linux-gnu
+cpp-9-arm-linux-gnueabihf
+cpp-9-doc
+cpp-9-powerpc64le-linux-gnu
+cpp-9-s390x-linux-gnu
+drac-dev
+fonts-arabeyes
+g++-9
+g++-9-aarch64-linux-gnu
+g++-9-arm-linux-gnueabihf
+g++-9-multilib
+g++-9-powerpc64le-linux-gnu
+g++-9-s390x-linux-gnu
+gcc-10-cross-base
+gcc-9
+gcc-9-aarch64-linux-gnu
+gcc-9-aarch64-linux-gnu-base
+gcc-9-arm-linux-gnueabihf
+gcc-9-arm-linux-gnueabihf-base
+gcc-9-base
+gcc-9-cross-base
+gcc-9-doc
+gcc-9-multilib
+gcc-9-powerpc64le-linux-gnu
+gcc-9-powerpc64le-linux-gnu-base
+gcc-9-s390x-linux-gnu
+gcc-9-s390x-linux-gnu-base
+gfortran-9
+gfortran-9-doc
+gfortran-9-multilib
+gfxboot
+gfxboot-dev
+gir1.2-amtk-5
+gir1.2-appindicator3-0.1
+gir1.2-appstreamglib-1.0
+gnome-software
+gnome-software-common
+gnome-software-dev
+gnome-software-doc
+gnome-software-plugin-snap
+golang-1.13
+golang-1.13-doc
+golang-1.13-go
+golang-1.13-race-detector-runtime
+golang-1.13-src
+golang-github-opencontainers-runc-dev
+golang-github-snapcore-snapd-dev
+golang-github-ubuntu-core-snappy-dev
+golang-redhat-audit-dev
+gutenprint-doc
+initramfs-tools-devices
+isolinux
+jasper
+lib32asan5
+lib32gcc-9-dev
+lib32gfortran-9-dev
+lib32go-9-dev
+lib32go14
+lib32stdc++-9-dev
+lib64asan5
+lib64gcc-9-dev
+lib64gfortran-9-dev
+lib64go-9-dev
+lib64go14
+lib64stdc++-9-dev
+libamtk-5-0
+libamtk-5-common
+libamtk-5-dev
+libapparmor-perl
+libappindicator-doc
+libappindicator3-1
+libappindicator3-dev
+libappstream-glib-dev
+libappstream-glib8
+libasan5
+libasan5-arm64-cross
+libasan5-armhf-cross
+libasan5-ppc64el-cross
+libasan5-s390x-cross
+libasync-mergepoint-perl
+libboost-filesystem-dev
+libboost-system-dev
+libconfig-general-perl
+libcppunit-subunit-dev
+libcppunit-subunit0
+libcuda1-340
+libemail-valid-perl
+libffi7
+libfuture-perl
+libgcc-9-dev
+libgcc-9-dev-arm64-cross
+libgcc-9-dev-armhf-cross
+libgcc-9-dev-ppc64el-cross
+libgcc-9-dev-s390x-cross
+libgfortran-9-dev
+libgo-9-dev
+libgo14
+libgutenprint-dev
+libgutenprint-doc
+libio-async-loop-epoll-perl
+libio-async-perl
+libjs-modernizr
+liblinux-epoll-perl
+libllvm9
+liblua5.2-0
+liblua5.2-0-dbg
+liblua5.2-dev
+libnss-extrausers
+libnss-myhostname
+libnvidia-extra-440
+libopenobex2
+libopenobex2-dev
+libpfm4
+libpfm4-dev
+libsereal-perl
+libsss-sudo
+libstdc++-9-dev
+libstdc++-9-dev-arm64-cross
+libstdc++-9-dev-armhf-cross
+libstdc++-9-dev-ppc64el-cross
+libstdc++-9-dev-s390x-cross
+libstdc++-9-doc
+libstdc++-9-pic
+libstruct-dumb-perl
+libsubunit-dev
+libsubunit0
+libtest-fatal-perl
+libtest-refcount-perl
+libtext-levenshtein-perl
+libvirt-daemon-driver-storage-rbd
+libx32asan5
+libx32gcc-9-dev
+libx32gfortran-9-dev
+libx32go-9-dev
+libx32go14
+libx32stdc++-9-dev
+libxml-writer-perl
+libxmlrpc-epi-dev
+libxmlrpc-epi0
+libxmlrpc-epi0-dbg
+lilo
+lilo-doc
+lua5.2-doc
+lz4
+mutter
+nvidia-opencl-icd-340
+ocl-icd-dev
+ocl-icd-libopencl1
+ocl-icd-opencl-dev
+oem-config-debconf
+opencl-c-headers
+openobex-apps
+psf-unifont
+python-genshi-doc
+python-polib-doc
+python3-astroid
+python3-entrypoints
+python3-feedparser
+python3-genshi
+python3-kazoo
+python3-lazy-object-proxy
+python3-logilab-common
+python3-nine
+python3-pep8
+python3-polib
+python3-pyxs
+python3-requests-unixsocket
+python3-scripttest
+python3-subunit
+python3-testrepository
+python3-zake
+qemu
+seccomp
+syslinux
+tegaki-zinnia-japanese
+tgt
+ttf-unifont
+ubuntu-core-snapd-units
+ubuntu-fan
+ubuntu-wallpapers-focal
+unifont
+vino
+xfonts-unifont