Update ubiquity 10.0

This commit is contained in:
Luis Guzmán 2021-10-10 15:14:25 +00:00
parent 2d87ef6227
commit 759d566a44
2 changed files with 28 additions and 3 deletions

View file

@ -0,0 +1,17 @@
diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm
index 08e96d1..227301c 100755
--- a/bin/ubiquity-dm
+++ b/bin/ubiquity-dm
@@ -404,11 +404,7 @@ EndSection
stdin=null, stdout=logfile, stderr=logfile,
preexec_fn=self.drop_privileges))
- if (
- osextras.find_on_path("kwin") or
- osextras.find_on_path("kwin_x11") or
- osextras.find_on_path("gnome-shell")
- ) and osextras.find_on_path("dbus-update-activation-environment"):
+ if osextras.find_on_path("dbus-update-activation-environment"):
subprocess.Popen(
[
"dbus-update-activation-environment",

View file

@ -18,7 +18,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=14 VERSION=15
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
#REPOKEY="871920D1991BC93C"
. ./config . ./config
@ -31,7 +33,6 @@ replace ubuntu_installed trisquel_installed .
replace linux-signed linux-lowlatency . replace linux-signed linux-lowlatency .
replace shim-signed shim . replace shim-signed shim .
mv d-i/source/shim-signed d-i/source/shim
replace grub-efi-amd64-signed grub-efi-amd64 . replace grub-efi-amd64-signed grub-efi-amd64 .
/bin/sed '/canonical/d' -i debian/ubiquity.install* /bin/sed '/canonical/d' -i debian/ubiquity.install*
@ -39,6 +40,13 @@ rm tests/test_ubi_partman*
sed -i '0,/ubuntu-artwork/{/ubuntu-artwork/d;}' debian/control sed -i '0,/ubuntu-artwork/{/ubuntu-artwork/d;}' debian/control
#Early patch ubiquity-dm, remove after 21.10.9 is out.
NEED_PATCH="$(grep 'osextras.find_on_path("kwin") or' bin/ubiquity-dm)"
if [ -n "$NEED_PATCH" ]; then
echo "Applying a11n fix patch."
patch -p1 < $DATA/apply-before-21.10.9-release.patch
fi
export DEB_BUILD_OPTIONS=nocheck export DEB_BUILD_OPTIONS=nocheck
# Fix update issues on clean installations: https://trisquel.info/es/forum/update-issues-clean-install # Fix update issues on clean installations: https://trisquel.info/es/forum/update-issues-clean-install