CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated grub2 for flidas build

Browse source
This commit is contained in:
Ruben Rodriguez 2016-11-27 18:31:31 +00:00
parent 24dea1d1ff
commit 359faf61b8
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
helpers/config
View file

@ -55,6 +55,7 @@ find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execd
}
changelog(){
head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
PKGVERSION=$(dpkg-parsechangelog --show-field Version)
echo | dch -D $REPO -v ${PKGVERSION}+${REVISION}trisquel${VERSION} "$1"
# Make sure the changelog file is identical between archs

14
helpers/make-grub2
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2011 Rubén Rodríguez <ruben@trisquel.info>
# Copyright (C) 2011-2016 Ruben Rodriguez <ruben@trisquel.info>
#
# 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 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=5
VERSION=1
COMPONENT=main
. ./config
@ -31,7 +31,7 @@ for i in install_efi_ubuntu_flavours.patch mkconfig_ubuntu_distributor.patch; do
done
#Allow passwords https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1311302
sed '/^CLASS/s/class os/class os --unrestricted/' -i util/grub.d/10_linux.in
/bin/sed '/CLASS=/s/class os/class os --unrestricted/' -i util/grub.d/* debian/patches/mkconfig_other_inits.patch
replace "with Linux" "with Linux-Libre" util
replace "with Linux" "with Linux-Libre" debian
@ -40,8 +40,6 @@ replace Ubuntu Trisquel .
replace ubuntu trisquel .
find |grep ubuntu|xargs rename s/ubuntu/trisquel/
#sed 's/\(prefix=@prefix@\)/\1\nGRUB_CMDLINE_EXTRA=$( grep -q nomodeset \/proc\/cmdline \&\& echo nomodeset \|\| echo -n "" )/' util/grub.d/10_linux.in -i
cat << EOF >> debian/default/grub
# Trisquel comes without kernel recovery entries to improve security.
@ -50,19 +48,13 @@ EOF
GRUBVERSION=$(head -n1 debian/changelog |/bin/sed 's/.*(//;s/).*//; s/[~+-].*//')
echo $GRUBVERSION
echo /bin/sed "/GNU GRUB version/ s/PACKAGE_VERSION/\"$GRUBVERSION\"/" -i grub-core/normal/main.c
/bin/sed "/GNU GRUB version/ s/PACKAGE_VERSION/\"$GRUBVERSION\"/" -i grub-core/normal/main.c
changelog "Disable rescue mode by default, branding"
#sed "s/-.*)/-${REVISION}trisquel${VERSION})/" -i debian/changelog
# 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
#apt-get install -y --force-yes kvm-pxe
# /dev is needed for KVM support
#mount none -t devtmpfs /dev || true
compile
#umount /dev