From 83089bff4b1cd5074f1d30545945eea5c95506df Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 10:10:08 -0700 Subject: [PATCH 1/4] skip tests/grub_cmd_set_time --- helpers/make-grub2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers/make-grub2 b/helpers/make-grub2 index 416e271..a242f85 100644 --- a/helpers/make-grub2 +++ b/helpers/make-grub2 @@ -52,5 +52,7 @@ sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestri changelog "rebranded and adapted for trisquel" +sed -i '/set -e/aexit77' tests/grub_cmd_set_date.in + compile From cdd090fc906aa431aa64bcd9c921d2c33a799414 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 10:42:02 -0700 Subject: [PATCH 2/4] bump version, update copyright, update changelog --- helpers/make-grub2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helpers/make-grub2 b/helpers/make-grub2 index a242f85..14101b4 100644 --- a/helpers/make-grub2 +++ b/helpers/make-grub2 @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2011-2017 Ruben Rodriguez +# 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 @@ -17,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 COMPONENT=main . ./config @@ -54,5 +55,7 @@ changelog "rebranded and adapted for trisquel" sed -i '/set -e/aexit77' tests/grub_cmd_set_date.in +changelog "skip test grub_cmd_set_date.in" + compile From 1c7b727ebce51a26e56f6c205eaedc748fd980d2 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 10:54:23 -0700 Subject: [PATCH 3/4] typo --- helpers/make-grub2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-grub2 b/helpers/make-grub2 index 14101b4..652bfa9 100644 --- a/helpers/make-grub2 +++ b/helpers/make-grub2 @@ -53,7 +53,7 @@ sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestri changelog "rebranded and adapted for trisquel" -sed -i '/set -e/aexit77' tests/grub_cmd_set_date.in +sed -i '/set -e/aexit 77' tests/grub_cmd_set_date.in changelog "skip test grub_cmd_set_date.in" From 8ce12c4563baf5df712989ee6a86ea4900372074 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 12:51:38 -0700 Subject: [PATCH 4/4] remove other changelog line --- helpers/make-grub2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/helpers/make-grub2 b/helpers/make-grub2 index 652bfa9..c9adcfc 100644 --- a/helpers/make-grub2 +++ b/helpers/make-grub2 @@ -51,8 +51,6 @@ find |grep ubuntu|xargs rename s/ubuntu/trisquel/ # Allow Windows and MacOX entries to boot without a password sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestricted/;' -i ./util/grub.d/30_os-prober.in -changelog "rebranded and adapted for trisquel" - sed -i '/set -e/aexit 77' tests/grub_cmd_set_date.in changelog "skip test grub_cmd_set_date.in"