Commit graph

66 commits

Author SHA1 Message Date
Benno Fünfstück
98bb71f41b grub2: simplify gnulib usage 2020-02-23 19:17:48 +01:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Andreas Wiese
8ba94a8fe8 grub2: 2.04-rc1 -> 2.04 (#67622) 2019-09-02 00:47:19 -04:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
df4d0fab2f grub: 2.02 -> 2.04-rc1 2019-05-11 13:40:21 -04:00
Vladimír Čunát
61ef8f0b42
grub2: patch to work with updated binutils
This blocked some EFI stuff and consequently the channels.
I would fetchpatch, but their cgit server won't work on this commit.
2019-02-20 11:22:54 +01:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Markus Kowalewski
aed8699993
grub: add patch for XFS sparse inode feature
xfsprogs-4.16 introduced an new on disk format feature
that is not recognized properly by grub. This patch
allows grub to access XFS filesystem created with
xfsprogs >= 4.16.
This upstream patch can be removed for grub-2.03.
2018-12-10 13:52:55 +01:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Symphorien Gibol
3e09239882 grub2: compile grub-mount as well
It is a dependency of os-prober >= 1.75
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23
2018-05-26 20:44:38 +02:00
Will Dietz
e78900213b grub2: extend platforms to include all linux
This works (and is needed) on musl-based linux too!
2018-03-26 15:53:38 -05:00
Vladimír Čunát
ae9a49a77d grub2: pkgconfig to fix finding freetype 2018-03-16 03:16:46 +03:00
Franz Pletz
3317c71c5c
grub2: 2.x-2015-11-16 -> 2.02
Fixes #24451.
2017-08-14 07:57:15 +02:00
Thomas Tuegel
5265d551a9
grub2: unset CPP
Commit 093cc00cdd sets the environment variable
`CPP' by default, but this intereferes with dependency calculation.
2017-07-21 16:49:17 -05:00
Michał Pałka
55208cc2e1 pvgrub_image: add package
Add a package containing a pvgrub image for xen generated from grub2
2017-07-05 12:23:30 +00:00
Tuomas Tynkkynen
a9a706770a grub2: Make EFI grub work on aarch64 2017-03-07 16:11:41 +02:00
Tuomas Tynkkynen
be2a2db0f1 grub2: Workaround flex bug
I think the flex update in 6bded45883
causes this failure, presumably due to upstream breakage:

````
gcc -DHAVE_CONFIG_H -I.  -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.yy.c\" -I. -I. -I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/  -I./grub-core/lib/minilzo -I./grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -Werror  -fno-builtin -Wno-undef  -c -o libgrubmods_a-grub_script.yy.o `test -f 'grub_script.yy.c' || echo './'`grub_script.yy.c
./grub-core/script/yylex.l:34:0: error: "yyalloc" redefined [-Werror]
 #define yyalloc(size, scanner)   (grub_malloc((size)))
 ^
grub_script.yy.c:104:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:35:0: error: "yyfree" redefined [-Werror]
 #define yyfree(ptr, scanner)   (grub_free((ptr)))
 ^
grub_script.yy.c:108:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:36:0: error: "yyrealloc" redefined [-Werror]
 #define yyrealloc(ptr, size, scanner) (grub_realloc((ptr), (size)))
 ^
grub_script.yy.c:106:0: note: this is the location of the previous definition

 ^
cc1: all warnings being treated as errors
make[2]: *** [Makefile:7540: libgrubmods_a-grub_script.yy.o] Error 1
````

Work around it for now.
2017-01-05 12:53:43 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
349e50734e grub2: 2015-10-13 -> 2015-11-16 2015-11-17 21:16:01 -08:00
Tuomas Tynkkynen
464350aa01 grub2: Patch out GCC reference from modinfo.sh 2015-10-28 10:17:08 +01:00
William A. Kennington III
82792959b4 grub2: 2015-07-27 -> 2015-10-13 2015-10-17 13:46:47 -07:00
William A. Kennington III
f2d3b5ead9 grub2: 2015-07-05 -> 2015-07-27 2015-08-03 14:12:14 -07:00
William A. Kennington III
48f44bfa69 grub2: 2015-05-14 -> 2015-07-05 2015-07-09 22:17:54 -07:00
William A. Kennington III
484a7be844 grub2: 2015-04-24 -> 2015-05-14 2015-05-15 18:38:15 -07:00
Edward Tjörnhammar
b9b8e3acba {grub2,ceph,libs3,socket_wrapper,nss_wrapper}.src: use mirrors, https and fetchFromSavannah to enable better availability for proxied users 2015-04-28 22:50:57 +02:00
William A. Kennington III
4463bad2dd grub: Update from 2015-2-21 -> 2015-04-24 2015-04-27 18:25:56 -07:00
William A. Kennington III
e91d788b7c grub2: Another grub bump 2015-02-14 18:58:50 -08:00
William A. Kennington III
8e62c497ca grub2: Update git revision 2015-02-13 13:42:20 -08:00
William A. Kennington III
2a0754ccbc Merge pull request #5994 from ts468/grub
Add 'target' parameter for GRUB installation chain
2015-02-08 14:18:13 -08:00
William A. Kennington III
c8a4ecd91d grub: Doesn't support building bios and efi simultaneously 2015-02-07 20:32:36 -08:00
William A. Kennington III
ef80d73e6a grub: Enable zfs and efi by default since it's cheap to support 2015-02-07 15:18:37 -08:00
William A. Kennington III
15cf03a8ee Build userspace packages using the userspace zfs 2015-02-07 15:07:39 -08:00
Thomas Strobel
3767370866 Add target parameter to grub installation chain 2015-01-27 19:46:37 +01:00
Eelco Dolstra
1acfbca7df grub2: Fix building against Glibc 2.20
http://hydra.nixos.org/build/16563301
2014-10-30 09:28:10 +01:00
William A. Kennington III
88d270f62e grub2: Add localizations 2014-09-03 01:06:07 -07:00
William A. Kennington III
c369c4afbd grub2: Fix zfs support 2014-09-02 19:38:52 -07:00
William A. Kennington III
36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
2014-09-02 09:16:13 -07:00
Michael Raskin
94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub"
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
2014-08-31 12:58:37 +04:00
William A. Kennington III
0fdbc44411 grub: Fix typo 2014-08-28 13:36:41 -07:00
William A. Kennington III
dd18e67cfb grub: Cleanup efi support 2014-08-28 13:35:37 -07:00