From 15b43096b8019d52757c4f1b64272f8b0a14900a Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 22 Nov 2009 21:23:30 +0100 Subject: maj grub2#1.97.1-1 --- base/grub2/.footprint | 253 ++------------------------------------------------ base/grub2/.md5sum | 2 +- base/grub2/Pkgfile | 15 +-- 3 files changed, 18 insertions(+), 252 deletions(-) (limited to 'base/grub2') diff --git a/base/grub2/.footprint b/base/grub2/.footprint index 1935cd0e5..1b35e910d 100644 --- a/base/grub2/.footprint +++ b/base/grub2/.footprint @@ -1,254 +1,20 @@ drwxr-xr-x root/root boot/ drwxr-xr-x root/root boot/grub/ -rw-r--r-- root/root boot/grub/grub.cfg +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/grub.d/ +-rwxr-xr-x root/root etc/grub.d/00_header +-rwxr-xr-x root/root etc/grub.d/10_linux +-rwxr-xr-x root/root etc/grub.d/30_os-prober +-rwxr-xr-x root/root etc/grub.d/40_custom +-rw-r--r-- root/root etc/grub.d/README drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/grub-editenv --rwxr-xr-x root/root usr/bin/grub-fstest -rwxr-xr-x root/root usr/bin/grub-mkelfimage -rwxr-xr-x root/root usr/bin/grub-mkfont -rwxr-xr-x root/root usr/bin/grub-mkimage -rwxr-xr-x root/root usr/bin/grub-mkrescue -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/grub.d/ --rwxr-xr-x root/root usr/etc/grub.d/00_header --rwxr-xr-x root/root usr/etc/grub.d/10_linux --rwxr-xr-x root/root usr/etc/grub.d/30_os-prober --rwxr-xr-x root/root usr/etc/grub.d/40_custom --rw-r--r-- root/root usr/etc/grub.d/README -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/grub/ --rw-r--r-- root/root usr/include/grub/acorn_filecore.h --rw-r--r-- root/root usr/include/grub/acpi.h --rw-r--r-- root/root usr/include/grub/aout.h --rw-r--r-- root/root usr/include/grub/ata.h --rw-r--r-- root/root usr/include/grub/auth.h --rw-r--r-- root/root usr/include/grub/autoefi.h --rw-r--r-- root/root usr/include/grub/bitmap.h --rw-r--r-- root/root usr/include/grub/boot.h --rw-r--r-- root/root usr/include/grub/bufio.h --rw-r--r-- root/root usr/include/grub/cache.h --rw-r--r-- root/root usr/include/grub/command.h -lrwxrwxrwx root/root usr/include/grub/cpu -> ../.././include/grub/i386 --rw-r--r-- root/root usr/include/grub/datetime.h --rw-r--r-- root/root usr/include/grub/device.h --rw-r--r-- root/root usr/include/grub/disk.h --rw-r--r-- root/root usr/include/grub/dl.h -drwxr-xr-x root/root usr/include/grub/efi/ --rw-r--r-- root/root usr/include/grub/efi/api.h --rw-r--r-- root/root usr/include/grub/efi/console.h --rw-r--r-- root/root usr/include/grub/efi/console_control.h --rw-r--r-- root/root usr/include/grub/efi/disk.h --rw-r--r-- root/root usr/include/grub/efi/efi.h --rw-r--r-- root/root usr/include/grub/efi/memory.h --rw-r--r-- root/root usr/include/grub/efi/pe32.h --rw-r--r-- root/root usr/include/grub/efi/time.h --rw-r--r-- root/root usr/include/grub/efi/uga_draw.h -drwxr-xr-x root/root usr/include/grub/efiemu/ --rw-r--r-- root/root usr/include/grub/efiemu/efiemu.h --rw-r--r-- root/root usr/include/grub/efiemu/runtime.h --rw-r--r-- root/root usr/include/grub/elf.h --rw-r--r-- root/root usr/include/grub/elfload.h --rw-r--r-- root/root usr/include/grub/env.h --rw-r--r-- root/root usr/include/grub/err.h --rw-r--r-- root/root usr/include/grub/extcmd.h --rw-r--r-- root/root usr/include/grub/fbblit.h --rw-r--r-- root/root usr/include/grub/fbfill.h --rw-r--r-- root/root usr/include/grub/fbutil.h --rw-r--r-- root/root usr/include/grub/file.h --rw-r--r-- root/root usr/include/grub/font.h --rw-r--r-- root/root usr/include/grub/fs.h --rw-r--r-- root/root usr/include/grub/fshelp.h --rw-r--r-- root/root usr/include/grub/gpt_partition.h --rw-r--r-- root/root usr/include/grub/gzio.h --rw-r--r-- root/root usr/include/grub/handler.h --rw-r--r-- root/root usr/include/grub/hfs.h -drwxr-xr-x root/root usr/include/grub/i386/ --rw-r--r-- root/root usr/include/grub/i386/at_keyboard.h --rw-r--r-- root/root usr/include/grub/i386/bsd.h --rw-r--r-- root/root usr/include/grub/i386/cmos.h -drwxr-xr-x root/root usr/include/grub/i386/coreboot/ --rw-r--r-- root/root usr/include/grub/i386/coreboot/boot.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/console.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/init.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/kernel.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/loader.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/machine.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/memory.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/serial.h --rw-r--r-- root/root usr/include/grub/i386/coreboot/time.h -drwxr-xr-x root/root usr/include/grub/i386/efi/ --rw-r--r-- root/root usr/include/grub/i386/efi/kernel.h --rw-r--r-- root/root usr/include/grub/i386/efi/loader.h --rw-r--r-- root/root usr/include/grub/i386/efi/machine.h --rw-r--r-- root/root usr/include/grub/i386/efi/memory.h --rw-r--r-- root/root usr/include/grub/i386/efi/time.h --rw-r--r-- root/root usr/include/grub/i386/efiemu.h --rw-r--r-- root/root usr/include/grub/i386/halt.h -drwxr-xr-x root/root usr/include/grub/i386/ieee1275/ --rw-r--r-- root/root usr/include/grub/i386/ieee1275/console.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/ieee1275.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/kernel.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/loader.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/machine.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/memory.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/serial.h --rw-r--r-- root/root usr/include/grub/i386/ieee1275/time.h --rw-r--r-- root/root usr/include/grub/i386/io.h --rw-r--r-- root/root usr/include/grub/i386/kernel.h --rw-r--r-- root/root usr/include/grub/i386/linux.h --rw-r--r-- root/root usr/include/grub/i386/loader.h --rw-r--r-- root/root usr/include/grub/i386/macho.h --rw-r--r-- root/root usr/include/grub/i386/multiboot.h -drwxr-xr-x root/root usr/include/grub/i386/pc/ --rw-r--r-- root/root usr/include/grub/i386/pc/biosdisk.h --rw-r--r-- root/root usr/include/grub/i386/pc/biosnum.h --rw-r--r-- root/root usr/include/grub/i386/pc/boot.h --rw-r--r-- root/root usr/include/grub/i386/pc/chainloader.h --rw-r--r-- root/root usr/include/grub/i386/pc/console.h --rw-r--r-- root/root usr/include/grub/i386/pc/efiemu.h --rw-r--r-- root/root usr/include/grub/i386/pc/init.h --rw-r--r-- root/root usr/include/grub/i386/pc/kernel.h --rw-r--r-- root/root usr/include/grub/i386/pc/loader.h --rw-r--r-- root/root usr/include/grub/i386/pc/machine.h --rw-r--r-- root/root usr/include/grub/i386/pc/memory.h --rw-r--r-- root/root usr/include/grub/i386/pc/pxe.h --rw-r--r-- root/root usr/include/grub/i386/pc/serial.h --rw-r--r-- root/root usr/include/grub/i386/pc/time.h --rw-r--r-- root/root usr/include/grub/i386/pc/vbe.h --rw-r--r-- root/root usr/include/grub/i386/pc/vga.h --rw-r--r-- root/root usr/include/grub/i386/pci.h --rw-r--r-- root/root usr/include/grub/i386/pit.h -drwxr-xr-x root/root usr/include/grub/i386/qemu/ --rw-r--r-- root/root usr/include/grub/i386/qemu/boot.h --rw-r--r-- root/root usr/include/grub/i386/qemu/console.h --rw-r--r-- root/root usr/include/grub/i386/qemu/init.h --rw-r--r-- root/root usr/include/grub/i386/qemu/kernel.h --rw-r--r-- root/root usr/include/grub/i386/qemu/loader.h --rw-r--r-- root/root usr/include/grub/i386/qemu/machine.h --rw-r--r-- root/root usr/include/grub/i386/qemu/memory.h --rw-r--r-- root/root usr/include/grub/i386/qemu/serial.h --rw-r--r-- root/root usr/include/grub/i386/qemu/time.h --rw-r--r-- root/root usr/include/grub/i386/reboot.h --rw-r--r-- root/root usr/include/grub/i386/setjmp.h --rw-r--r-- root/root usr/include/grub/i386/time.h --rw-r--r-- root/root usr/include/grub/i386/tsc.h --rw-r--r-- root/root usr/include/grub/i386/types.h --rw-r--r-- root/root usr/include/grub/i386/vga_common.h --rw-r--r-- root/root usr/include/grub/i386/xnu.h -drwxr-xr-x root/root usr/include/grub/ieee1275/ --rw-r--r-- root/root usr/include/grub/ieee1275/ieee1275.h --rw-r--r-- root/root usr/include/grub/ieee1275/ofdisk.h --rw-r--r-- root/root usr/include/grub/kernel.h -drwxr-xr-x root/root usr/include/grub/lib/ --rw-r--r-- root/root usr/include/grub/lib/LzFind.h --rw-r--r-- root/root usr/include/grub/lib/LzHash.h --rw-r--r-- root/root usr/include/grub/lib/LzmaDec.h --rw-r--r-- root/root usr/include/grub/lib/LzmaEnc.h --rw-r--r-- root/root usr/include/grub/lib/LzmaTypes.h --rw-r--r-- root/root usr/include/grub/lib/arg.h --rw-r--r-- root/root usr/include/grub/lib/crc.h --rw-r--r-- root/root usr/include/grub/lib/envblk.h --rw-r--r-- root/root usr/include/grub/lib/hexdump.h --rw-r--r-- root/root usr/include/grub/list.h --rw-r--r-- root/root usr/include/grub/loader.h --rw-r--r-- root/root usr/include/grub/lvm.h -lrwxrwxrwx root/root usr/include/grub/machine -> ../.././include/grub/i386/pc --rw-r--r-- root/root usr/include/grub/macho.h --rw-r--r-- root/root usr/include/grub/machoload.h --rw-r--r-- root/root usr/include/grub/memory.h --rw-r--r-- root/root usr/include/grub/menu.h --rw-r--r-- root/root usr/include/grub/menu_viewer.h --rw-r--r-- root/root usr/include/grub/misc.h --rw-r--r-- root/root usr/include/grub/mm.h --rw-r--r-- root/root usr/include/grub/msdos_partition.h --rw-r--r-- root/root usr/include/grub/multiboot.h --rw-r--r-- root/root usr/include/grub/multiboot2.h --rw-r--r-- root/root usr/include/grub/multiboot_loader.h --rw-r--r-- root/root usr/include/grub/net.h --rw-r--r-- root/root usr/include/grub/normal.h --rw-r--r-- root/root usr/include/grub/ntfs.h --rw-r--r-- root/root usr/include/grub/parser.h --rw-r--r-- root/root usr/include/grub/partition.h --rw-r--r-- root/root usr/include/grub/parttool.h --rw-r--r-- root/root usr/include/grub/pci.h -drwxr-xr-x root/root usr/include/grub/powerpc/ -drwxr-xr-x root/root usr/include/grub/powerpc/ieee1275/ --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/biosdisk.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/console.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/ieee1275.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/kernel.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/loader.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/machine.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/memory.h --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/time.h -drwxr-xr-x root/root usr/include/grub/powerpc/ieee1275/util/ --rw-r--r-- root/root usr/include/grub/powerpc/ieee1275/util/biosdisk.h --rw-r--r-- root/root usr/include/grub/powerpc/kernel.h --rw-r--r-- root/root usr/include/grub/powerpc/libgcc.h --rw-r--r-- root/root usr/include/grub/powerpc/setjmp.h --rw-r--r-- root/root usr/include/grub/powerpc/time.h --rw-r--r-- root/root usr/include/grub/powerpc/types.h --rw-r--r-- root/root usr/include/grub/raid.h --rw-r--r-- root/root usr/include/grub/reader.h --rw-r--r-- root/root usr/include/grub/script_sh.h --rw-r--r-- root/root usr/include/grub/scsi.h --rw-r--r-- root/root usr/include/grub/scsicmd.h --rw-r--r-- root/root usr/include/grub/setjmp.h -drwxr-xr-x root/root usr/include/grub/sparc64/ -drwxr-xr-x root/root usr/include/grub/sparc64/ieee1275/ --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/boot.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/console.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/ieee1275.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/kernel.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/loader.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/machine.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/memory.h --rw-r--r-- root/root usr/include/grub/sparc64/ieee1275/time.h --rw-r--r-- root/root usr/include/grub/sparc64/kernel.h --rw-r--r-- root/root usr/include/grub/sparc64/libgcc.h --rw-r--r-- root/root usr/include/grub/sparc64/setjmp.h --rw-r--r-- root/root usr/include/grub/sparc64/time.h --rw-r--r-- root/root usr/include/grub/sparc64/types.h --rw-r--r-- root/root usr/include/grub/symbol.h --rw-r--r-- root/root usr/include/grub/term.h --rw-r--r-- root/root usr/include/grub/terminfo.h --rw-r--r-- root/root usr/include/grub/time.h --rw-r--r-- root/root usr/include/grub/tparm.h --rw-r--r-- root/root usr/include/grub/types.h --rw-r--r-- root/root usr/include/grub/usb.h --rw-r--r-- root/root usr/include/grub/usbdesc.h --rw-r--r-- root/root usr/include/grub/usbtrans.h -drwxr-xr-x root/root usr/include/grub/util/ --rw-r--r-- root/root usr/include/grub/util/console.h --rw-r--r-- root/root usr/include/grub/util/deviceiter.h --rw-r--r-- root/root usr/include/grub/util/getroot.h --rw-r--r-- root/root usr/include/grub/util/hostdisk.h --rw-r--r-- root/root usr/include/grub/util/lvm.h --rw-r--r-- root/root usr/include/grub/util/misc.h --rw-r--r-- root/root usr/include/grub/util/ofpath.h --rw-r--r-- root/root usr/include/grub/util/raid.h --rw-r--r-- root/root usr/include/grub/util/resolve.h --rw-r--r-- root/root usr/include/grub/video.h --rw-r--r-- root/root usr/include/grub/video_fb.h -drwxr-xr-x root/root usr/include/grub/x86_64/ -drwxr-xr-x root/root usr/include/grub/x86_64/efi/ --rw-r--r-- root/root usr/include/grub/x86_64/efi/kernel.h --rw-r--r-- root/root usr/include/grub/x86_64/efi/loader.h --rw-r--r-- root/root usr/include/grub/x86_64/efi/machine.h --rw-r--r-- root/root usr/include/grub/x86_64/efi/memory.h --rw-r--r-- root/root usr/include/grub/x86_64/efi/time.h --rw-r--r-- root/root usr/include/grub/x86_64/kernel.h --rw-r--r-- root/root usr/include/grub/x86_64/linux.h --rw-r--r-- root/root usr/include/grub/x86_64/macho.h --rw-r--r-- root/root usr/include/grub/x86_64/pci.h --rw-r--r-- root/root usr/include/grub/x86_64/setjmp.h --rw-r--r-- root/root usr/include/grub/x86_64/time.h --rw-r--r-- root/root usr/include/grub/x86_64/types.h --rw-r--r-- root/root usr/include/grub/x86_64/xnu.h --rw-r--r-- root/root usr/include/grub/xnu.h --rw-r--r-- root/root usr/include/multiboot.h --rw-r--r-- root/root usr/include/multiboot2.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/grub/ -rw-r--r-- root/root usr/lib/grub/grub-mkconfig_lib @@ -324,7 +90,6 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/ls.mod -rw-r--r-- root/root usr/lib/grub/i386-pc/lsmmap.mod -rw-r--r-- root/root usr/lib/grub/i386-pc/lspci.mod --rw-r--r-- root/root usr/lib/grub/i386-pc/lua.mod -rw-r--r-- root/root usr/lib/grub/i386-pc/lvm.mod -rw-r--r-- root/root usr/lib/grub/i386-pc/mdraid.mod -rw-r--r-- root/root usr/lib/grub/i386-pc/memdisk.mod @@ -395,8 +160,6 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/xnu_uuid.mod -rw-r--r-- root/root usr/lib/grub/update-grub_lib drwxr-xr-x root/root usr/sbin/ --rwxr-xr-x root/root usr/sbin/grub-dumpbios --rwxr-xr-x root/root usr/sbin/grub-emu -rwxr-xr-x root/root usr/sbin/grub-install -rwxr-xr-x root/root usr/sbin/grub-mkconfig -rwxr-xr-x root/root usr/sbin/grub-mkdevicemap @@ -404,6 +167,8 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/grub-setup drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/grub/ +drwxr-xr-x root/root usr/share/info/ +-rw-r--r-- root/root usr/share/info/grub.info.gz drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ drwxr-xr-x root/root usr/share/man/man8/ diff --git a/base/grub2/.md5sum b/base/grub2/.md5sum index fa5bf912d..b50f21fc5 100644 --- a/base/grub2/.md5sum +++ b/base/grub2/.md5sum @@ -1,2 +1,2 @@ -542917012de4d2e47241bdffb67bedef grub-1.97~beta3.tar.gz +66fe18cd9318e3d67a34d7b7a8e7b1f6 grub-1.97.1.tar.gz 39c7eaf1127012f1f548f2b5dfda47d6 grub.cfg diff --git a/base/grub2/Pkgfile b/base/grub2/Pkgfile index 22fbf7a16..361ace17b 100755 --- a/base/grub2/Pkgfile +++ b/base/grub2/Pkgfile @@ -5,8 +5,8 @@ # Depends on: name=grub2 -version=1.97 -release=4 +version=1.97.1 +release=1 source=(ftp://alpha.gnu.org/gnu/grub/grub-$version.tar.gz\ grub.cfg) build() { @@ -15,15 +15,16 @@ build() { unset CFLAGS ./configure --prefix=/usr \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --sysconfdir=/etc \ + --disable-grub-emu \ + --disable-grub-emu-usb \ + --disable-grub-fstest \ + --disable-efiemu \ + --infodir=/usr/share/info make make DESTDIR=$PKG install install -d $PKG/boot/grub install -d $PKG/usr/share - # cp -v ../message $PKG/boot/ -# cp -v $PKG/usr/lib/grub/i386-pc/stage{1,2} $PKG/boot/grub -# cp -v $PKG/usr/lib/grub/i386-pc/e2fs_stage1_5 $PKG/boot/grub -# cp -v $PKG/usr/lib/grub/i386-pc/reiserfs_stage1_5 $PKG/boot/grub if [ -f $PKG/usr/share/info/dir ]; then rm $PKG/usr/share/info/dir fi -- cgit v1.2.3-70-g09d2