diff --git a/debian/changelog b/debian/changelog index 40240bb45..f4017e8a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ grub2 (2.00-1) UNRELEASED; urgency=low lots of OS-specific code to iterate over all possible devices, we use it in a number of scripts to discover devices and reimplementing those in terms of something else would be very complicated. + * Add grub-ia64-bin and grub-ia64 packages. These are currently + experimental, and grub-ia64 does not automatically run grub-install. -- Christian Perrier Sat, 02 Jun 2012 19:51:35 +0200 diff --git a/debian/control b/debian/control index 1e0cf034d..16397a211 100644 --- a/debian/control +++ b/debian/control @@ -62,7 +62,7 @@ Description: GRand Unified Bootloader, version 2 (dummy package) Package: grub-common Priority: optional -Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel +Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel any-ia64 Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base Replaces: grub-pc (<< 1.99-1), grub-ieee1275 (<< 1.99-1), grub-efi (<< 1.99-1), grub-coreboot (<< 1.99-1), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 1.99-1), grub-efi-amd64 (<< 1.99-1), grub-yeeloong (<< 1.99-1) Recommends: os-prober (>= 1.33) @@ -78,7 +78,7 @@ Description: GRand Unified Bootloader (common files) Package: grub2-common Priority: optional -Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel +Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel any-ia64 Depends: grub-common (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} Replaces: grub, grub-legacy, grub-common (<< 1.99-1), grub-pc (<< 1.99-1), grub-ieee1275 (<< 1.99-1), grub-efi (<< 1.99-1), grub-coreboot (<< 1.99-1), grub-linuxbios (<< 1.99-1), grub-efi-ia32 (<< 1.99-1), grub-efi-amd64 (<< 1.99-1), grub-yeeloong (<< 1.99-1) Conflicts: grub (<< 0.97-54), grub-legacy, grub-doc (<< 0.97-32), grub-legacy-doc (<< 0.97-59) @@ -379,9 +379,45 @@ Description: GRand Unified Bootloader, version 2 (Yeeloong version) This package contains a version of GRUB that has been built for use with the Lemote Yeeloong laptop. +Package: grub-ia64-bin +Architecture: any-ia64 +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}) +Multi-Arch: foreign +Description: GRand Unified Bootloader, version 2 (IA64 binaries) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub2. + . + This package contains a version of GRUB that has been built for use on + IA64. It will not automatically install GRUB as the active boot loader, + nor will it automatically update grub.cfg on upgrade, so most people should + install grub-ia64 instead. + +Package: grub-ia64 +Architecture: any-ia64 +Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-ia64-bin (= ${binary:Version}), ucf +Multi-Arch: foreign +Description: GRand Unified Bootloader, version 2 (IA64 version) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub2. + . + This package contains a version of GRUB that has been built for use on + IA64. + Package: grub-mount-udeb XC-Package-Type: udeb Section: debian-installer -Architecture: i386 amd64 powerpc ppc64 sparc mipsel kfreebsd-i386 kfreebsd-amd64 +Architecture: i386 amd64 powerpc ppc64 sparc mipsel ia64 kfreebsd-i386 kfreebsd-amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: export GRUB filesystems using FUSE diff --git a/debian/grub-common.install.ia64.in b/debian/grub-common.install.ia64.in new file mode 100644 index 000000000..f5f3231fd --- /dev/null +++ b/debian/grub-common.install.ia64.in @@ -0,0 +1,2 @@ +usr/bin/grub-mkrescue +usr/share/man/man1/grub-mkrescue.1 diff --git a/debian/rules b/debian/rules index 07cfeaaee..157b6eca5 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version) AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links BUILD_PACKAGES := $(strip $(shell dh_listpackages)) -REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-ieee1275 grub-firmware-qemu grub-yeeloong +REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-ieee1275 grub-firmware-qemu grub-yeeloong grub-ia64 ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU))) COMMON_PLATFORM := pc @@ -46,6 +46,8 @@ else ifneq (,$(filter powerpc ppc64 sparc,$(DEB_HOST_ARCH_CPU))) COMMON_PLATFORM := ieee1275 else ifeq (mipsel,$(DEB_HOST_ARCH_CPU)) COMMON_PLATFORM := yeeloong +else ifeq (ia64,$(DEB_HOST_ARCH_CPU)) +COMMON_PLATFORM := ia64 else $(error COMMON_PLATFORM not set for $(DEB_HOST_ARCH_CPU)) endif @@ -82,7 +84,7 @@ build/stamps/configure-grub-common: build/stamps/configure-grub-$(COMMON_PLATFOR build/stamps/build-grub-common: build/stamps/build-grub-$(COMMON_PLATFORM) -build/stamps/configure-grub-pc build/stamps/configure-grub-ieee1275 build/stamps/configure-grub-coreboot build/stamps/configure-grub-emu build/stamps/configure-grub-yeeloong: build/stamps/autogen +build/stamps/configure-grub-pc build/stamps/configure-grub-ieee1275 build/stamps/configure-grub-coreboot build/stamps/configure-grub-emu build/stamps/configure-grub-yeeloong build/stamps/configure-grub-ia64: build/stamps/autogen mkdir -p build/stamps build/$(package) dh_auto_configure -- $(confflags) --with-platform=$(subst grub-,,$(package)) touch $@ @@ -102,7 +104,7 @@ build/stamps/configure-grub-firmware-qemu: build/stamps/autogen dh_auto_configure -- $(confflags) --with-platform=qemu touch $@ -build/stamps/build-grub-efi-ia32 build/stamps/build-grub-efi-amd64 build/stamps/build-grub-ieee1275 build/stamps/build-grub-coreboot build/stamps/build-grub-emu build/stamps/build-grub-yeeloong: build/stamps/build-%: build/stamps/configure-% +build/stamps/build-grub-efi-ia32 build/stamps/build-grub-efi-amd64 build/stamps/build-grub-ieee1275 build/stamps/build-grub-coreboot build/stamps/build-grub-emu build/stamps/build-grub-yeeloong build/stamps/build-grub-ia64: build/stamps/build-%: build/stamps/configure-% dh_auto_build touch $@ @@ -163,7 +165,7 @@ platform_subst = \ >> debian/$(2).$(3); \ fi -install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-yeeloong: +install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-yeeloong install/grub-ia64: dh_auto_install --destdir=debian/tmp-$(package) if [ "$@" != "install/grub-emu" ] ; then \ @@ -236,7 +238,7 @@ override_dh_install: dh_install -p$$package --sourcedir=debian/tmp-grub-$(COMMON_PLATFORM); \ done rm -f debian/grub2-common/usr/share/info/dir* - set -e; for package in grub-pc grub-efi-ia32 grub-efi-amd64 grub-ieee1275 grub-coreboot grub-yeeloong; do \ + set -e; for package in grub-pc grub-efi-ia32 grub-efi-amd64 grub-ieee1275 grub-coreboot grub-yeeloong grub-ia64; do \ dh_install -p$$package --sourcedir=debian/tmp-$$package; \ dh_install -p$$package-bin --sourcedir=debian/tmp-$$package; \ done @@ -259,7 +261,7 @@ override_dh_clean: debian/legacy/update-grub debian/grub-extras chmod +x debian/{script,grub.d/*,legacy/*,kernel/*} for i in $(AUTOGEN_DEB_FILES) ; do \ - rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,yeeloong}{,-bin}.$$i ; \ + rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,yeeloong,ia64}{,-bin}.$$i ; \ done rm -rf debian/tmp-*/