vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-09-29 Felix Zielcke <fzielcke@z-51.de>

Browse source 
* util/update-grub_lib.in: Copy to ...
	* util/grub-mkconfig_lib.in: ... this.  Update all users.
	* util/update-grub_lib.in: Make it a stub to `grub-mkconfigig_lib.in'.
	* util/update-grub.in: Rename to ...
	* util/grub-mkconfig.in: ... this.  Update all users.  Remove `-y'
	option. Add `--output' option to allow users to specify the generated
	configuration file.  Default to stdout.
	(update_grub_dir): Rename to ...
	(grub_mkconfig_dir): ... this.
	(grub_cfg): Default to an empty string.
	* conf/common.rmk (update-grub): Rename to ...
	(grub-mkconfig): ... this.
	(update-grub_lib): Copy to ...
	(grub-mkconfig_lib): ... this.
	(update-grub_SCRIPTS): Copy to ...
	(grub-mkconfig_SCRIPTS): ... this. Update all users.
	(update-grub_DATA): Rename to ...
	(grub-mkconfig_DATA): ... this.
This commit is contained in:
fzielcke 2008-09-29 14:57:05 +00:00
parent 556ce6ac48
commit 18ade780ed
13 changed files with 262 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

22
conf/common.rmk
View file

@ -115,12 +115,18 @@ endif
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c
CLEANFILES += grub-pe2elf
# For update-grub
update-grub: util/update-grub.in config.status
# For grub-mkconfig
grub-mkconfig: util/grub-mkconfig.in config.status
./config.status --file=$@:$<
chmod +x $@
sbin_SCRIPTS += update-grub
CLEANFILES += update-grub
sbin_SCRIPTS += grub-mkconfig
CLEANFILES += grub-mkconfig
grub-mkconfig_lib: util/grub-mkconfig_lib.in config.status
./config.status --file=$@:$<
chmod +x $@
lib_DATA += grub-mkconfig_lib
CLEANFILES += grub-mkconfig_lib
update-grub_lib: util/update-grub_lib.in config.status
./config.status --file=$@:$<
@ -131,14 +137,14 @@ CLEANFILES += update-grub_lib
%: util/grub.d/%.in config.status
./config.status --file=$@:$<
chmod +x $@
update-grub_SCRIPTS = 00_header 10_linux 10_hurd 30_os-prober 40_custom
grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 30_os-prober 40_custom
ifeq ($(target_os), cygwin)
update-grub_SCRIPTS += 10_windows
grub-mkconfig_SCRIPTS += 10_windows
endif
CLEANFILES += $(update-grub_SCRIPTS)
CLEANFILES += $(grub-mkconfig_SCRIPTS)
update-grub_DATA += util/grub.d/README
grub-mkconfig_DATA += util/grub.d/README
# Filing systems.