Fix apply changes to right grub2 version
This commit is contained in:
parent
3425c64813
commit
70527c416c
2 changed files with 6 additions and 5 deletions
|
|
@ -153,7 +153,11 @@ cd PACKAGES/$PACKAGE
|
|||
|
||||
#Get package and uncompress it
|
||||
apt-get update -c $LOCAL_APT/etc/apt.conf
|
||||
apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
|
||||
if [ -n "$FIXED_VER" ]; then
|
||||
apt-get source $PACKAGE=$FIXED_VER --download-only -c ${LOCAL_APT}/etc/apt.conf
|
||||
else
|
||||
apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
|
||||
fi
|
||||
# Verify it first
|
||||
if grep -q "BEGIN PGP SIGNATURE" *.dsc; then
|
||||
KEY=$(gpg2 --keyid-format 0xlong --verify *.dsc 2>&1 | grep 0x | sed 's/.*0x//' || true)
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#
|
||||
|
||||
VERSION=5
|
||||
FIXED_VER=2.04-1ubuntu26.13
|
||||
COMPONENT=main
|
||||
|
||||
. ./config
|
||||
|
|
@ -50,9 +51,6 @@ replace Ubuntu Trisquel .
|
|||
replace ubuntu trisquel .
|
||||
find |grep ubuntu|xargs rename s/ubuntu/trisquel/
|
||||
|
||||
#Avoid the use of signed grub efi package
|
||||
sed -i '/Recommends:/s|grub-efi-amd64-signed|grub-efi-amd64|' debian/control
|
||||
|
||||
# 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
|
||||
|
||||
|
|
@ -61,4 +59,3 @@ 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