From 6e2361a8190199fb4322143f7ddcbf3b8f386638 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Sun, 8 Sep 2019 01:26:35 -0700 Subject: [PATCH 1/5] remove ubuntu-specific tests, livepatch, snap --- .../remove_livepatch_from_gtk_ui.patch | 234 ++++++++++++++++++ helpers/make-software-properties | 13 +- 2 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch diff --git a/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch b/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch new file mode 100644 index 0000000..23200e0 --- /dev/null +++ b/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch @@ -0,0 +1,234 @@ +--- data/gtkbuilder/main.ui 2019-09-08 00:59:05.221188984 -0700 ++++ data/gtkbuilder/main.ui 2019-09-08 00:56:52.294542817 -0700 +@@ -1116,231 +1116,6 @@ + False + + +- +- +- True +- False +- 12 +- vertical +- 12 +- +- +- True +- False +- Canonical Livepatch helps keep your system secure by applying security updates that don't require a restart. <a href="https://www.ubuntu.com/livepatch">Learn More</a> +- True +- True +- 1 +- 0 +- +- +- False +- True +- 0 +- +- +- +- +- True +- False +- 6 +- +- +- True +- False +- True +- +- +- False +- True +- 0 +- +- +- +- +- False +- +- +- False +- True +- 1 +- +- +- +- +- True +- False +- +- +- False +- True +- 2 +- +- +- +- +- True +- True +- +- +- False +- True +- end +- 3 +- +- +- +- +- False +- True +- 1 +- +- +- +- +- False +- crossfade +- True +- +- +- True +- True +- in +- +- +- True +- True +- 6 +- False +- word +- 6 +- 6 +- False +- textbuffer_livepatch +- False +- +- +- +- +- page_livepatch_message +- +- +- +- +- True +- False +- vertical +- 12 +- +- +- True +- False +- 0 +- +- +- False +- True +- 0 +- +- +- +- +- True +- False +- 0 +- +- +- False +- True +- 1 +- +- +- +- +- True +- True +- in +- +- +- True +- True +- model_livepatch_fixes +- False +- False +- False +- +- +- +- +- +- column +- +- +- 100 +- word +- 100 +- +- +- 0 +- +- +- +- +- +- +- +- +- True +- True +- 2 +- +- +- +- +- page_livepatch_status +- 1 +- +- +- +- +- True +- True +- 2 +- +- +- +- +- Show Livepatch status in the top bar +- True +- False +- True +- False +- start +- True +- +- +- False +- True +- end +- 3 +- +- +- +- +- 6 +- +- +- +- +- True +- False +- Livepatch +- +- +- 6 +- False +- +- + + + True diff --git a/helpers/make-software-properties b/helpers/make-software-properties index a2c6993..5e99a5b 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -2,6 +2,7 @@ # # Copyright (C) 2011-2016 Rubén Rodríguez # Copyright (C) 2011 Carlos Pais +# Copyright (C) 2019 Mason Hock # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config @@ -64,5 +65,15 @@ replace "Trisquel-Gettext" "Ubuntu-Gettext" . changelog "Adapted for Trisquel codenames" + +sed '/test_suite/d' -i setup.py +rm -rf tests + +sed '/gir1.2-snapd-1/d' -i debian/control +sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py +patch -p0 < $DATA/remove_livepatch_from_gtk_ui.patch + +changelog "Removed Ubuntu-specifc tests, Livepatch, Snap" + compile From 324b1c8c2acd195c5d24fe50b0cfb2c83296c2e5 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Mon, 9 Sep 2019 12:24:57 -0700 Subject: [PATCH 2/5] actually disable snap --- helpers/make-software-properties | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/make-software-properties b/helpers/make-software-properties index 5e99a5b..ae63481 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -72,6 +72,7 @@ rm -rf tests sed '/gir1.2-snapd-1/d' -i debian/control sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py patch -p0 < $DATA/remove_livepatch_from_gtk_ui.patch +sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py changelog "Removed Ubuntu-specifc tests, Livepatch, Snap" From 0e809a3bdca66bf9b37208b12eb4d4aecae397ec Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 01:05:10 -0700 Subject: [PATCH 3/5] remove Additional Drivers desktop file --- helpers/make-software-properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers/make-software-properties b/helpers/make-software-properties index ae63481..e592397 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -74,6 +74,8 @@ sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py patch -p0 < $DATA/remove_livepatch_from_gtk_ui.patch sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py +rm data/software-properties-drivers.desktop.in + changelog "Removed Ubuntu-specifc tests, Livepatch, Snap" compile From 9f0dddc152dbb8bc0b1008a2076f8233aa7afb88 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 01:14:11 -0700 Subject: [PATCH 4/5] remove Additional Drivers desktop file --- helpers/make-software-properties | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/make-software-properties b/helpers/make-software-properties index e592397..73879b1 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -75,6 +75,7 @@ patch -p0 < $DATA/remove_livepatch_from_gtk_ui.patch sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py rm data/software-properties-drivers.desktop.in +sed -i '/software-properties-drivers/d' po/POTFILES.in changelog "Removed Ubuntu-specifc tests, Livepatch, Snap" From 40c0c0c9aa3a081179f54a239bbf62cec4dd0c2e Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 12:53:08 -0700 Subject: [PATCH 5/5] removed other changelog line --- helpers/make-software-properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/helpers/make-software-properties b/helpers/make-software-properties index 73879b1..2b0e654 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -63,9 +63,6 @@ sed '/software-properties-drivers/d' -i debian/software-properties-gtk.install s replace "Trisquel-Gettext" "Ubuntu-Gettext" . -changelog "Adapted for Trisquel codenames" - - sed '/test_suite/d' -i setup.py rm -rf tests