Merge branch 'fix-make-grub2' into 'etiona'
Fix make grub2 See merge request trisquel/package-helpers!253
This commit is contained in:
commit
5c3c7a724e
1 changed files with 5 additions and 2 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2011-2017 Ruben Rodriguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
|
||||
#
|
||||
# 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
|
||||
|
|
@ -50,7 +51,9 @@ 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"
|
||||
|
||||
compile
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue