* Move a few files to grub-common and remove them from the arch-

specific packages.
This commit is contained in:
rmh 2008-08-02 23:35:00 +00:00
parent fea42faaeb
commit 883ceab7de
4 changed files with 21 additions and 12 deletions

7
debian/changelog vendored
View File

@ -1,9 +1,14 @@
grub2 (1.96+20080730-2) experimental; urgency=low
[ Felix Zielcke ]
* [ Updated translations ]
* Japanese (ja.po) by Hideki Yamane (Closes: #493347)
-- Felix Zielcke <fzielcke@z-51.de> Sat, 02 Aug 2008 11:46:30 +0200
[ Robert Millan ]
* Move a few files to grub-common and remove them from the arch-
specific packages.
-- Robert Millan <rmh@aybabtu.com> Sun, 3 Aug 2008 01:29:21 +0200
grub2 (1.96+20080730-1) experimental; urgency=low

View File

@ -1,4 +1,4 @@
usr/bin
usr/sbin
usr/share/grub
usr/share/bug/grub-linuxbios
usr/share/bug/grub-coreboot

View File

@ -1,5 +1,5 @@
debian/presubj usr/share/bug/grub-linuxbios
debian/script usr/share/bug/grub-linuxbios
debian/presubj usr/share/bug/grub-coreboot
debian/script usr/share/bug/grub-coreboot
debian/default etc
debian/grub.d etc
debian/update-grub2 usr/sbin

20
debian/rules vendored
View File

@ -35,7 +35,7 @@ configure/grub-common::
mkdir -p build/grub-common
cd build/grub-common && $(CONFIGURE)
build/grub-pc build/grub-efi build/grub-ieee1275 build/grub-coreboot::
build/grub-common build/grub-pc build/grub-efi build/grub-ieee1275 build/grub-coreboot::
$(MAKE) -C $@
build/grub-rescue-pc:: build/grub-pc
@ -55,12 +55,6 @@ build/grub-rescue-pc:: build/grub-pc
--image-type=cdrom \
$(CURDIR)/$@/grub-rescue-cdrom.iso
build/grub-common::
# Yes, grub-mkdevicemap shouldn't really be here. We're assuming 'pc'
# for i386 and 'ieee1275' for powerpc. Not a big deal though. See
# also debian/patches/04_run_grub_mkdevicemap_when_grub_probe_fails.diff
$(MAKE) -C $@ grub-probe grub-mkdevicemap
install/grub-pc install/grub-efi install/grub-ieee1275 install/grub-coreboot::
$(MAKE) -C $(subst install/,build/,$@) install DESTDIR=$(CURDIR)/debian/$(subst install/,,$@)/
@ -71,7 +65,11 @@ install/grub-pc install/grub-efi install/grub-ieee1275 install/grub-coreboot::
fi
# shipped with grub-common
rm -f $(CURDIR)/debian/$(subst install/,,$@)/{usr/sbin/grub-{probe,mkdevicemap},usr/share/man/man8/grub-probe.8}
rm -rf $(CURDIR)/debian/$(subst install/,,$@)/etc/grub.d
rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{sbin,share/man/man8}/grub-{probe,mkdevicemap}{,.8}
rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{bin,share/man/man1}/grub-{editenv,pe2elf}{,.1}
rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/lib/grub/update-grub_lib
rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/share/grub/*.pff
for i in docs ; do \
cp debian/$$i.in debian/$(subst install/,,$@).$$i ; \
@ -87,6 +85,12 @@ install/grub-pc install/grub-efi install/grub-ieee1275 install/grub-coreboot::
| sed -e "s%.*%$(subst install/,,$@): statically-linked-binary &%g" \
>> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@)
install/grub-common::
$(MAKE) -C $(subst install/,build/,$@) install DESTDIR=$(CURDIR)/debian/$(subst install/,,$@)/
rm -rf $(CURDIR)/debian/$(subst install/,,$@)/usr/lib/grub/{i386,powerpc}-*
rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{sbin,share/man/man8}/{update-grub,grub-install,grub-emu,grub-setup}{,.8}
rm -f $(CURDIR)/debian/$(subst install/,,$@)/usr/{bin,share/man/man1}/grub-{mkimage,mkrescue}{,.1}
clean:: debian/legacy/update-grub
chmod +x debian/{script,grub.d/*,legacy/*}
-rm -f debian/grub-{pc,efi,ieee1275,coreboot}.docs debian/grub-pc.substvars