D6683.id16054.diff
No OneTemporary
Actions

Size

14 KB

Referenced Files

None

Subscribers

None

D6683.id16054.diff
View Options

	diff --git a/package.yml b/package.yml
	--- a/package.yml
	+++ b/package.yml
	@@ -1,10 +1,10 @@
	name : grub2
	-version : '2.02'
	-release : 25
	+version : '2.04'
	+release : 26
	source :
	- - https://ftp.gnu.org/gnu/grub/grub-2.02.tar.xz : 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f
	-homepage : http://www.gnu.org/software/grub/
	-license : GPL-3.0
	+ - https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz : e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d
	+homepage : https://www.gnu.org/software/grub/
	+license : GPL-3.0-or-later
	component : system.boot
	summary : GRUB Boot Loader
	description: \|
	@@ -17,10 +17,11 @@
	strip : no
	rundeps :
	- os-prober
	-setup : \|
	+environment: \|
	unset CFLAGS
	unset LDFLAGS
	unset CXXFLAGS
	+setup : \|
	%patch -p1 < $pkgfiles/brand.patch
	%configure --disable-werror \
	--enable-device-mapper \
	@@ -28,17 +29,11 @@
	--with-platform="pc" \
	--target="i386"
	build : \|
	- unset CFLAGS
	- unset LDFLAGS
	- unset CXXFLAGS
	%make
	install : \|
	- unset CFLAGS
	- unset LDFLAGS
	- unset CXXFLAGS
	%make_install
	- install -Dm0755 $pkgfiles/update-grub $installdir/usr/sbin/update-grub
	- install -Dm0755 $pkgfiles/update-grub2 $installdir/usr/sbin/update-grub2
	- install -Dm0644 $pkgfiles/conf/grub $installdir/etc/default/grub
	- install -Dm0644 $pkgfiles/splash.tga $installdir/usr/share/backgrounds/splash.tga
	- install -Dm0644 $pkgfiles/unicode.pf2 $installdir/usr/share/grub/unicode.pf2
	+ install -Dm00755 $pkgfiles/update-grub $installdir/usr/sbin/update-grub
	+ install -Dm00755 $pkgfiles/update-grub2 $installdir/usr/sbin/update-grub2
	+ install -Dm00644 $pkgfiles/conf/grub $installdir/etc/default/grub
	+ install -Dm00644 $pkgfiles/splash.tga $installdir/usr/share/backgrounds/splash.tga
	+ install -Dm00644 $pkgfiles/unicode.pf2 $installdir/usr/share/grub/unicode.pf2
	diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
	--- a/pspec_x86_64.xml
	+++ b/pspec_x86_64.xml
	@@ -1,17 +1,17 @@
	<PISI>
	<Source>
	<Name>grub2</Name>
	- <Homepage>http://www.gnu.org/software/grub/</Homepage>
	+ <Homepage>https://www.gnu.org/software/grub/</Homepage>
	<Packager>
	- <Name>Ikey Doherty</Name>
	- <Email>ikey@solus-project.com</Email>
	+ <Name>Pierre-Yves</Name>
	+ <Email>pyu@riseup.net</Email>
	</Packager>
	- <License>GPL-3.0</License>
	+ <License>GPL-3.0-or-later</License>
	<PartOf>system.boot</PartOf>
	<Summary xml:lang="en">GRUB Boot Loader</Summary>
	<Description xml:lang="en">GRUB Boot Loader
	</Description>
	- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
	+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
	</Source>
	<Package>
	<Name>grub2</Name>
	@@ -29,7 +29,23 @@
	<Path fileType="config">/etc/grub.d/40_custom</Path>
	<Path fileType="config">/etc/grub.d/41_custom</Path>
	<Path fileType="config">/etc/grub.d/README</Path>
	- <Path fileType="executable">/usr/bin</Path>
	+ <Path fileType="executable">/usr/bin/grub-editenv</Path>
	+ <Path fileType="executable">/usr/bin/grub-file</Path>
	+ <Path fileType="executable">/usr/bin/grub-fstest</Path>
	+ <Path fileType="executable">/usr/bin/grub-glue-efi</Path>
	+ <Path fileType="executable">/usr/bin/grub-kbdcomp</Path>
	+ <Path fileType="executable">/usr/bin/grub-menulst2cfg</Path>
	+ <Path fileType="executable">/usr/bin/grub-mkfont</Path>
	+ <Path fileType="executable">/usr/bin/grub-mkimage</Path>
	+ <Path fileType="executable">/usr/bin/grub-mklayout</Path>
	+ <Path fileType="executable">/usr/bin/grub-mknetdir</Path>
	+ <Path fileType="executable">/usr/bin/grub-mkpasswd-pbkdf2</Path>
	+ <Path fileType="executable">/usr/bin/grub-mkrelpath</Path>
	+ <Path fileType="executable">/usr/bin/grub-mkrescue</Path>
	+ <Path fileType="executable">/usr/bin/grub-mkstandalone</Path>
	+ <Path fileType="executable">/usr/bin/grub-render-label</Path>
	+ <Path fileType="executable">/usr/bin/grub-script-check</Path>
	+ <Path fileType="executable">/usr/bin/grub-syslinux2cfg</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/acpi.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/acpi.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/adler32.mod</Path>
	@@ -161,8 +177,11 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/ext2.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/extcmd.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/extcmd.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/f2fs.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/f2fs.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/fat.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/fat.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/fdt.lst</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/file.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/file.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/font.mod</Path>
	@@ -414,6 +433,8 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/pci.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/pcidump.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/pcidump.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/pgp.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/pgp.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/plan9.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/plan9.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/play.mod</Path>
	@@ -440,6 +461,8 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/raid6rec.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/random.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/random.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/rdmsr.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/rdmsr.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/read.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/read.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/reboot.mod</Path>
	@@ -486,6 +509,8 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/spkmodem.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/squash4.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/squash4.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/strtoull_test.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/strtoull_test.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/syslinuxcfg.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/syslinuxcfg.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/tar.mod</Path>
	@@ -545,8 +570,8 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/usbtest.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/vbe.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/vbe.module</Path>
	- <Path fileType="library">/usr/lib64/grub/i386-pc/verify.mod</Path>
	- <Path fileType="library">/usr/lib64/grub/i386-pc/verify.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/verifiers.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/verifiers.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/vga.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/vga.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/vga_text.mod</Path>
	@@ -568,6 +593,8 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/videotest.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/videotest_checksum.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/videotest_checksum.module</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/wrmsr.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/wrmsr.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/xfs.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/xfs.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/xnu.mod</Path>
	@@ -584,21 +611,73 @@
	<Path fileType="library">/usr/lib64/grub/i386-pc/zfscrypt.module</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/zfsinfo.mod</Path>
	<Path fileType="library">/usr/lib64/grub/i386-pc/zfsinfo.module</Path>
	- <Path fileType="executable">/usr/sbin</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/zstd.mod</Path>
	+ <Path fileType="library">/usr/lib64/grub/i386-pc/zstd.module</Path>
	+ <Path fileType="executable">/usr/sbin/grub-bios-setup</Path>
	+ <Path fileType="executable">/usr/sbin/grub-install</Path>
	+ <Path fileType="executable">/usr/sbin/grub-macbless</Path>
	+ <Path fileType="executable">/usr/sbin/grub-mkconfig</Path>
	+ <Path fileType="executable">/usr/sbin/grub-ofpathname</Path>
	+ <Path fileType="executable">/usr/sbin/grub-probe</Path>
	+ <Path fileType="executable">/usr/sbin/grub-reboot</Path>
	+ <Path fileType="executable">/usr/sbin/grub-set-default</Path>
	+ <Path fileType="executable">/usr/sbin/grub-sparc64-setup</Path>
	+ <Path fileType="executable">/usr/sbin/update-grub</Path>
	+ <Path fileType="executable">/usr/sbin/update-grub2</Path>
	<Path fileType="data">/usr/share/backgrounds/splash.tga</Path>
	<Path fileType="data">/usr/share/grub/grub-mkconfig_lib</Path>
	<Path fileType="data">/usr/share/grub/unicode.pf2</Path>
	- <Path fileType="info">/usr/share/info</Path>
	- <Path fileType="localedata">/usr/share/locale</Path>
	+ <Path fileType="info">/usr/share/info/grub-dev.info</Path>
	+ <Path fileType="info">/usr/share/info/grub.info</Path>
	+ <Path fileType="localedata">/usr/share/locale/ast/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/ca/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/da/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/de/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/de_CH/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/en@arabic/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/en@greek/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/en@quot/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/eo/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/es/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/fi/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/fr/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/gl/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/hr/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/hu/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/id/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/it/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/ja/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/ko/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/lt/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/nb/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/nl/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/pa/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/pl/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/pt/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/pt_BR/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/ro/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/ru/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/sl/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/sr/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/sv/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/tr/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/uk/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/vi/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/zh_CN/LC_MESSAGES/grub.mo</Path>
	+ <Path fileType="localedata">/usr/share/locale/zh_TW/LC_MESSAGES/grub.mo</Path>
	</Files>
	</Package>
	<History>
	- <Update release="25">
	- <Date>2018-05-22</Date>
	- <Version>2.02</Version>
	+ <Update release="26">
	+ <Date>2019-07-05</Date>
	+ <Version>2.04</Version>
	<Comment>Packaging update</Comment>
	- <Name>Ikey Doherty</Name>
	- <Email>ikey@solus-project.com</Email>
	+ <Name>Pierre-Yves</Name>
	+ <Email>pyu@riseup.net</Email>
	</Update>
	</History>
	</PISI>
	\ No newline at end of file

File Metadata

Mime Type: text/plain
Expires: Sat, Jul 15, 7:20 AM (3 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5799617
Default Alt Text: D6683.id16054.diff (14 KB)

D6683.id16054.diffNo OneTemporaryActions

D6683.id16054.diffView Options

File Metadata

Event Timeline

D6683.id16054.diff
No OneTemporary
Actions

D6683.id16054.diff
View Options