core updated.
This commit is contained in:
Ertuğrul Erata
@@ -0,0 +1,3 @@
|
||||
<PISI>
|
||||
<Name>system.boot</Name>
|
||||
</PISI>
|
||||
@@ -0,0 +1,62 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/copyleft/gpl.txt
|
||||
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
shelltools.copy("../unifont*.bdf", "./unifont.bdf")
|
||||
shelltools.export("GRUB_CONTRIB", "%s/grub-%s/grub-extras" % (get.workDIR(), get.srcVERSION()))
|
||||
|
||||
pisitools.cflags.remove("-fstack-protector", "-fasynchronous-unwind-tables", "-fexceptions", "-fPIC")
|
||||
pisitools.cflags.sub("\s?(-O[\ds]|-D_FORTIFY_SOURCE=\d)\s?", " ")
|
||||
|
||||
#shelltools.system("./linguas.sh")
|
||||
shelltools.system("./autogen.sh")
|
||||
autotools.configure("--disable-werror \
|
||||
--with-grubdir=grub2 \
|
||||
--program-transform-name='s,grub,grub2,'\
|
||||
--program-prefix= \
|
||||
--htmldir='/usr/share/doc/grub2/html' ")
|
||||
|
||||
def build():
|
||||
#make-dist for creating all updated translation files
|
||||
autotools.make("dist")
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
# Install unicode.pf2 using downloaded font source.
|
||||
shelltools.system("./grub-mkfont -o unicode.pf2 unifont.bdf")
|
||||
|
||||
# Create directory for grub.cfg file
|
||||
pisitools.dodir("/boot/grub2")
|
||||
pisitools.insinto("/boot/grub2", "unicode.pf2")
|
||||
|
||||
# Insall our theme
|
||||
pisitools.insinto("/usr/share/grub/themes/","themes/pisilinux")
|
||||
|
||||
#remove -r 0x0-0x7F entries to fix ugly fonts or find a suitable range parameter -r ***
|
||||
shelltools.system("./grub-mkfont -o DejaVuSans-10.pf2 -r 0x0-0x7F -s 10 /usr/share/fonts/dejavu/DejaVuSans.ttf")
|
||||
shelltools.system("./grub-mkfont -o DejaVuSans-12.pf2 -r 0x0-0x7F -s 12 /usr/share/fonts/dejavu/DejaVuSans.ttf")
|
||||
shelltools.system("./grub-mkfont -o DejaVuSans-14.pf2 -r 0x0-0x7F -s 14 /usr/share/fonts/dejavu/DejaVuSans.ttf")
|
||||
shelltools.system("./grub-mkfont -o DejaVuSans-16.pf2 -r 0x0-0x7F -s 16 /usr/share/fonts/dejavu/DejaVuSans.ttf")
|
||||
shelltools.system("./grub-mkfont -o DejaVuSans-Bold-14.pf2 -r 0x0-0x7F -s 14 /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf")
|
||||
shelltools.system("./grub-mkfont -o DejaVuSans-Mono-14.pf2 -r 0x0-0x7F -s 14 /usr/share/fonts/dejavu/DejaVuSansMono.ttf")
|
||||
shelltools.copy("ascii.pf2","%s/usr/share/grub/themes/pisilinux" % get.installDIR())
|
||||
|
||||
# Do not install auto generated dejavu* fonts
|
||||
fonts=["DejaVuSans-10.pf2" , "DejaVuSans-12.pf2" , "DejaVuSans-14.pf2" , "DejaVuSans-16.pf2" , "DejaVuSans-Mono-14.pf2", "DejaVuSans-Bold-14.pf2"]
|
||||
for font in fonts:
|
||||
shelltools.copy(font,"%s/usr/share/grub/themes/pisilinux" % get.installDIR())
|
||||
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
#Remove default starfiled theme.
|
||||
pisitools.removeDir("/usr/share/grub/themes/starfield")
|
||||
|
||||
pisitools.dodoc("ABOUT-NLS", "AUTHORS", "BUGS", "ChangeLog", "COPYING", "TODO", "README")
|
||||
@@ -0,0 +1,52 @@
|
||||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=10
|
||||
GRUB_DISTRIBUTOR="Pisi"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
|
||||
#GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Preload both GPT and MBR modules so that they are not missed
|
||||
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
|
||||
|
||||
# Uncomment to enable Hidden Menu, and optionally hide the timeout count
|
||||
#GRUB_HIDDEN_TIMEOUT=10
|
||||
#GRUB_HIDDEN_TIMEOUT_QUIET=true
|
||||
|
||||
# Uncomment to use basic console
|
||||
GRUB_TERMINAL_INPUT=console
|
||||
|
||||
# Uncomment to disable graphical terminal
|
||||
#GRUB_TERMINAL_OUTPUT=console
|
||||
|
||||
# The resolution used on graphical terminal
|
||||
# note that you can use only modes which your graphic card supports via VBE
|
||||
# you can see them in real GRUB with the command `vbeinfo'
|
||||
GRUB_GFXMODE=1024x768
|
||||
|
||||
# Uncomment to allow the kernel use the same resolution used by grub
|
||||
GRUB_GFXPAYLOAD_LINUX=keep
|
||||
|
||||
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
|
||||
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
|
||||
#GRUB_DISABLE_LINUX_UUID=true
|
||||
|
||||
# Uncomment to disable generation of recovery mode menu entries
|
||||
GRUB_DISABLE_RECOVERY=true
|
||||
|
||||
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
|
||||
# modes only. Entries specified as foreground/background."
|
||||
|
||||
GRUB_COLOR_NORMAL="white/black"
|
||||
GRUB_COLOR_HIGHLIGHT="black/white"
|
||||
|
||||
#GRUB_BACKGROUND="/usr/share/grub/pisi-grub-bg.png"
|
||||
|
||||
#GRUB_FONT="/usr/share/grub/unicode.pf2"
|
||||
|
||||
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
|
||||
#GRUB_THEME="/path/to/gfxtheme"
|
||||
#Possible locations
|
||||
GRUB_THEME="/usr/share/grub/themes/pisilinux/theme.txt"
|
||||
# Uncomment to get a beep at GRUB start
|
||||
#GRUB_INIT_TUNE="480 440 1"
|
||||
|
||||
#GRUB_SAVEDEFAULT="true"
|
||||
@@ -0,0 +1,54 @@
|
||||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=10
|
||||
GRUB_DISTRIBUTOR="Pisi"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="splash quiet"
|
||||
#GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Preload both GPT and MBR modules so that they are not missed
|
||||
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
|
||||
|
||||
# Uncomment to enable Hidden Menu, and optionally hide the timeout count
|
||||
GRUB_HIDDEN_TIMEOUT=10
|
||||
GRUB_HIDDEN_TIMEOUT_QUIET=true
|
||||
|
||||
# Uncomment to use basic console
|
||||
#GRUB_TERMINAL_INPUT=console
|
||||
|
||||
# Uncomment to disable graphical terminal
|
||||
#GRUB_TERMINAL_OUTPUT=console
|
||||
|
||||
# The resolution used on graphical terminal
|
||||
# note that you can use only modes which your graphic card supports via VBE
|
||||
# you can see them in real GRUB with the command `vbeinfo'
|
||||
GRUB_GFXMODE=800x600
|
||||
|
||||
# Uncomment to allow the kernel use the same resolution used by grub
|
||||
#GRUB_GFXPAYLOAD_LINUX=keep
|
||||
|
||||
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
|
||||
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
|
||||
#GRUB_DISABLE_LINUX_UUID=true
|
||||
|
||||
# Uncomment to disable generation of recovery mode menu entries
|
||||
GRUB_DISABLE_RECOVERY=true
|
||||
|
||||
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
|
||||
# modes only. Entries specified as foreground/background."
|
||||
|
||||
GRUB_COLOR_NORMAL="white/black"
|
||||
GRUB_COLOR_HIGHLIGHT="black/white"
|
||||
|
||||
GRUB_BACKGROUND="/boot/grub2/pisi-grub-bg.png"
|
||||
|
||||
GRUB_FONT="/boot/grub2/unicode.pf2"
|
||||
|
||||
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
|
||||
#GRUB_THEME="/path/to/gfxtheme"
|
||||
#Possible locations
|
||||
#GRUB_THEME="/usr/share/grub/themes/"
|
||||
# Uncomment to get a beep at GRUB start
|
||||
#GRUB_INIT_TUNE="480 440 1"
|
||||
|
||||
#GRUB_SAVEDEFAULT="true"
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||
index 516be86..5f37db2 100644
|
||||
--- a/util/grub-mkconfig.in
|
||||
+++ b/util/grub-mkconfig.in
|
||||
@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
|
||||
GRUB_THEME \
|
||||
GRUB_GFXPAYLOAD_LINUX \
|
||||
GRUB_DISABLE_OS_PROBER \
|
||||
+ GRUB_COLOR_NORMAL \
|
||||
+ GRUB_COLOR_HIGHLIGHT \
|
||||
GRUB_INIT_TUNE \
|
||||
GRUB_SAVEDEFAULT \
|
||||
GRUB_ENABLE_CRYPTODISK \
|
||||
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||
index 765bfdc..b148558 100644
|
||||
--- a/util/grub.d/00_header.in
|
||||
+++ b/util/grub.d/00_header.in
|
||||
@@ -115,6 +115,14 @@ cat <<EOF
|
||||
|
||||
EOF
|
||||
|
||||
+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
|
||||
+ cat << EOF
|
||||
+set menu_color_normal=$GRUB_COLOR_NORMAL
|
||||
+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
|
||||
+
|
||||
+EOF
|
||||
+fi
|
||||
+
|
||||
serial=0;
|
||||
gfxterm=0;
|
||||
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 352 KiB |
@@ -0,0 +1,25 @@
|
||||
--- grub-2.00/util/grub.d/10_linux.in~ 2012-04-18 23:24:38.000000000 +0200
|
||||
+++ grub-2.00/util/grub.d/10_linux.in 2012-11-28 22:27:41.652673833 +0100
|
||||
@@ -29,7 +29,13 @@
|
||||
CLASS="--class gnu-linux --class gnu --class os"
|
||||
|
||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||
- OS=GNU/Linux
|
||||
+ if [ -f "/etc/pisilinux-release" ] ; then
|
||||
+ OS="$(sed 's, release .*$,,g' /etc/pisilinux-release)"
|
||||
+ elif [ -e "/etc/system-release" ] ; then
|
||||
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
||||
+ else
|
||||
+ OS=GNU/Linux
|
||||
+ fi
|
||||
else
|
||||
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
|
||||
@@ -193,6 +199,7 @@
|
||||
initrd=
|
||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
||||
"initrd-${version}" "initramfs-${version}.img" \
|
||||
+ "initramfs-${version}.gz" "initramfs-${version}" \
|
||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
||||
"initramfs-genkernel-${version}" \
|
||||
@@ -0,0 +1,163 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>grub2</Name>
|
||||
<Homepage>http://www.gnu.org/software/grub/</Homepage>
|
||||
<Packager>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv3</License>
|
||||
<PartOf>system.base</PartOf>
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>GNU GRUB is a Multiboot boot loader.</Summary>
|
||||
<Description>GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project.</Description>
|
||||
<Archive sha1sum="1bf580f1e8bce4909a7ac7ca485cee02b00ed383" type="tarxz">ftp://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz</Archive>
|
||||
<Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.02~beta2/grub-extras">http://source.pisilinux.org/1.0/grub2_extras_915resolution_r10.tar.xz</Archive>
|
||||
<Archive sha1sum="30797ba7a86fc32213b9ae994c9fa45f37d01170" type="gz">http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz</Archive>
|
||||
<Archive sha1sum="f87919489d3caa336aac74b39b01b91b1987ba83" type="tarxz" target="grub-2.02~beta2/themes">http://source.pisilinux.org/1.0/grub2-theme-pisilinux-0.2.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>autogen</Dependency>
|
||||
<Dependency>binutils</Dependency>
|
||||
<Dependency>bison</Dependency>
|
||||
<Dependency>flex</Dependency>
|
||||
<Dependency>gcc</Dependency>
|
||||
<Dependency>help2man</Dependency>
|
||||
<Dependency>texinfo</Dependency>
|
||||
<Dependency>freetype-devel</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>ncurses-devel</Dependency>
|
||||
<Dependency>xz-devel</Dependency>
|
||||
<Dependency>fuse-devel</Dependency>
|
||||
<Dependency>lvm2-devel</Dependency>
|
||||
<Dependency>device-mapper-devel</Dependency>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
<Dependency>dejavu-fonts</Dependency>
|
||||
</BuildDependencies>
|
||||
<Replaces>
|
||||
<Package>grub</Package>
|
||||
</Replaces>
|
||||
<Patches>
|
||||
<Patch level="1">pisi_name_and_initramfs.patch</Patch>
|
||||
<Patch level="1">mkconfig-fix.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>grub2</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>xz</Dependency>
|
||||
<Dependency>fuse</Dependency>
|
||||
<Dependency>lvm2</Dependency>
|
||||
<Dependency>device-mapper</Dependency>
|
||||
<Dependency>os-prober</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="executable">/usr/sbin</Path>
|
||||
<Path fileType="library">/usr/lib/grub/i386-pc/</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="data">/usr/share/grub</Path>
|
||||
<Path fileType="data">/usr/share/info</Path>
|
||||
<Path fileType="data">/boot/grub2</Path>
|
||||
<Path fileType="localedata">/usr/share/locale</Path>
|
||||
<Path fileType="man">/usr/share/man/man1</Path>
|
||||
<Path fileType="man">/usr/share/man/man8</Path>
|
||||
<Path fileType="config">/etc/bash_completion.d</Path>
|
||||
<Path fileType="config">/etc/grub.d</Path>
|
||||
<Path fileType="config">/etc/default</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/grub/pisi-grub-bg.png">pisi-grub-bg.png</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/default/grub">grub-defaults</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="11">
|
||||
<Date>2014-07-20</Date>
|
||||
<Version>2.02_beta2</Version>
|
||||
<Comment>New artwork.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="10">
|
||||
<Date>2014-05-11</Date>
|
||||
<Version>2.02_beta2</Version>
|
||||
<Comment>Release bump.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2014-01-21</Date>
|
||||
<Version>2.02_beta2</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2013-12-31</Date>
|
||||
<Version>2.00_5148</Version>
|
||||
<Comment>Fix finding other distros.
|
||||
Fix build with current freetype.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2013-09-02</Date>
|
||||
<Version>2.00_5148</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2013-08-24</Date>
|
||||
<Version>2.00</Version>
|
||||
<Comment>Comment GRUB_GFXPAYLOAD_LINUX=keep out.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2013-07-28</Date>
|
||||
<Version>2.00</Version>
|
||||
<Comment>Fix deps.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2013-06-17</Date>
|
||||
<Version>2.00</Version>
|
||||
<Comment>Set default grub2 resolution to 1024x768</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2013-03-03</Date>
|
||||
<Version>2.00</Version>
|
||||
<Comment>
|
||||
Add default Pisi Linux theme
|
||||
Remove unneeded unifont dep
|
||||
Manually create Dejavu pf2 fonts
|
||||
</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-02-09</Date>
|
||||
<Version>2.00</Version>
|
||||
<Comment>Enable splash again.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-11-28</Date>
|
||||
<Version>2.00</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>grub2</Name>
|
||||
<Summary xml:lang="en">GNU GRUB is a Multiboot boot loader.</Summary>
|
||||
<Description xml:lang="en">GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project.</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user