From: Ben Hutchings Date: Fri, 30 Jul 2010 17:32:03 +0000 (+0100) Subject: Imported Debian patch 3.12-3.1 X-Git-Tag: debian/3.12-3.1 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=9778e9d6861cf28b5c26f91692c604181dad00c4;p=debian%2Felilo Imported Debian patch 3.12-3.1 --- diff --git a/Makefile b/Makefile index 98d0323..613b597 100644 --- a/Makefile +++ b/Makefile @@ -25,19 +25,15 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/Make.defaults -TOPDIR = $(SRCDIR) +include Make.defaults +TOPDIR=. CRTOBJS = $(EFICRT0)/crt0-efi-$(ARCH).o LDSCRIPT = $(EFICRT0)/elf_$(ARCH)_efi.lds LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L$(EFILIB) -L$(GNUEFILIB) $(CRTOBJS) -LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name) +LOADLIBES = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name) FORMAT = efi-app-$(ARCH) FILESYSTEM = @@ -91,8 +87,7 @@ fileops.o : Make.defaults chooser.o : Make.defaults $(SUBDIRS): dummy - mkdir -p $@ - $(MAKE) -C $@ -f $(SRCDIR)/../$@/Makefile SRCDIR=$(SRCDIR)/../$@ ARCH=$(ARCH) + $(MAKE) -C $@ dummy: @@ -111,4 +106,4 @@ ifeq ($(GCC_VERSION),2) @exit 1 endif -include $(SRCDIR)/Make.rules +include Make.rules diff --git a/choosers/Makefile b/choosers/Makefile index 7860cc8..31b10d0 100644 --- a/choosers/Makefile +++ b/choosers/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES= @@ -48,11 +43,11 @@ TARGET=choosers.o all: $(TARGET) $(TARGET): check-choosers $(TOPDIR)/Make.defaults $(FILES) - $(LD) $(LD3264) -o $@ -r $(FILES) + $(LD) -o $@ -r $(FILES) clean: $(RM) -f $(TARGET) $(FILES) - + check-choosers: @if [ -n "$(FILES)" ]; then \ exit 0; \ diff --git a/debian/changelog b/debian/changelog index 8b73e9d..fb2ce99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +elilo (3.12-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Add kernel and initramfs hook scripts to ensure elilo is reinstalled + whenever the kernel or initramfs is updated. closes: #590023 + + -- Ben Hutchings Fri, 30 Jul 2010 18:32:03 +0100 + elilo (3.12-3) unstable; urgency=low * fix paths and options to build both 32 and 64 bit versions on either diff --git a/debian/dirs b/debian/dirs index 11174f4..76bd9e2 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,5 @@ +etc/initramfs/post-update.d +etc/kernel/postinst.d +etc/kernel/postrm.d usr/lib/elilo usr/sbin diff --git a/debian/elilo.initramfs-post-update b/debian/elilo.initramfs-post-update new file mode 100644 index 0000000..66bcbb1 --- /dev/null +++ b/debian/elilo.initramfs-post-update @@ -0,0 +1,11 @@ +#!/bin/sh +case "$DPKG_MAINTSCRIPT_PACKAGE" in + linux-image-*) + # elilo will be updated later by the kernel postinst hook; no + # need to update it now. + exit 0 + ;; + *) + elilo &2 + ;; +esac diff --git a/debian/elilo.kernel-postinst b/debian/elilo.kernel-postinst new file mode 100644 index 0000000..0b8c944 --- /dev/null +++ b/debian/elilo.kernel-postinst @@ -0,0 +1,2 @@ +#!/bin/sh +elilo &2 diff --git a/debian/elilo.kernel-postrm b/debian/elilo.kernel-postrm new file mode 100644 index 0000000..9cfff17 --- /dev/null +++ b/debian/elilo.kernel-postrm @@ -0,0 +1,3 @@ +#!/bin/sh +# Do not abort kernel removal in case of error +elilo &2 || true diff --git a/debian/patches/debian-changes-3.12-3 b/debian/patches/debian-changes-3.12-3 new file mode 100644 index 0000000..f632a23 --- /dev/null +++ b/debian/patches/debian-changes-3.12-3 @@ -0,0 +1,284 @@ +Description: Upstream changes introduced in version 3.12-3 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + elilo (3.12-3) unstable; urgency=low + . + * fix paths and options to build both 32 and 64 bit versions on either + flavor of build host, closes: #574713 + * don't generate noise when following symlink since that's now the normal + situation, closes: #581068 + . + The person named in the Author field signed this changelog entry. +Author: Bdale Garbee +Bug-Debian: http://bugs.debian.org/574713 +Bug-Debian: http://bugs.debian.org/581068 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- elilo-3.12.orig/Makefile ++++ elilo-3.12/Makefile +@@ -25,15 +25,19 @@ + # to use this program. + # + +-include Make.defaults +-TOPDIR=. ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/Make.defaults ++TOPDIR = $(SRCDIR) + + + CRTOBJS = $(EFICRT0)/crt0-efi-$(ARCH).o + LDSCRIPT = $(EFICRT0)/elf_$(ARCH)_efi.lds + + LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L$(EFILIB) -L$(GNUEFILIB) $(CRTOBJS) +-LOADLIBES = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name) ++LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name) + FORMAT = efi-app-$(ARCH) + + FILESYSTEM = +@@ -87,7 +91,8 @@ fileops.o : Make.defaults + chooser.o : Make.defaults + + $(SUBDIRS): dummy +- $(MAKE) -C $@ ++ mkdir -p $@ ++ $(MAKE) -C $@ -f $(SRCDIR)/../$@/Makefile SRCDIR=$(SRCDIR)/../$@ ARCH=$(ARCH) + + dummy: + +@@ -106,4 +111,4 @@ ifeq ($(GCC_VERSION),2) + @exit 1 + endif + +-include Make.rules ++include $(SRCDIR)/Make.rules +--- elilo-3.12.orig/devschemes/Makefile ++++ elilo-3.12/devschemes/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES=simple.o + +@@ -40,7 +45,7 @@ all: $(TARGET) + # without doing make clean. + # + $(TARGET): $(FILES) +- $(LD) -r -o $@ $(FILES) ++ $(LD) $(LD3264) -r -o $@ $(FILES) + + clean: + $(RM) -f $(TARGET) $(FILES) +--- elilo-3.12.orig/ia64/Makefile ++++ elilo-3.12/ia64/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES=system.o config.o fpswa.o plain_loader.o gzip_loader.o \ + gzip.o memset.o memcpy.o setjmp.o longjmp.o +--- elilo-3.12.orig/choosers/Makefile ++++ elilo-3.12/choosers/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES= + +@@ -43,11 +48,11 @@ TARGET=choosers.o + all: $(TARGET) + + $(TARGET): check-choosers $(TOPDIR)/Make.defaults $(FILES) +- $(LD) -o $@ -r $(FILES) ++ $(LD) $(LD3264) -o $@ -r $(FILES) + + clean: + $(RM) -f $(TARGET) $(FILES) +- ++ + check-choosers: + @if [ -n "$(FILES)" ]; then \ + exit 0; \ +--- elilo-3.12.orig/ia32/Makefile ++++ elilo-3.12/ia32/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o + +@@ -37,13 +42,13 @@ all: $(TARGET) + system.o: rmswitch.h + + rmswitch.h: bin_to_h.c rmswitch.S +- $(CC) -o bin_to_h bin_to_h.c +- $(AS) -o rmswitch.o rmswitch.S ++ $(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c ++ $(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S + $(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o + ./bin_to_h rmswitch.h + + $(TARGET): $(FILES) +- $(LD) -r -o $@ $(FILES) ++ $(LD) $(LD3264) -r -o $@ $(FILES) + + clean: + $(RM) -f $(TARGET) $(FILES) +--- elilo-3.12.orig/x86_64/Makefile ++++ elilo-3.12/x86_64/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o + #FILES=system.o config.o plain_loader.o +@@ -38,13 +43,13 @@ all: $(TARGET) + system.o: rmswitch.h + + rmswitch.h: bin_to_h.c rmswitch.S +- $(CC) -o bin_to_h bin_to_h.c +- $(AS) -o rmswitch.o rmswitch.S ++ $(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c ++ $(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S + $(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o + ./bin_to_h rmswitch.h + + $(TARGET): $(FILES) +- $(LD) -r -o $@ $(FILES) ++ $(LD) $(LD3264) -r -o $@ $(FILES) + + clean: + $(RM) -f $(TARGET) $(FILES) +--- elilo-3.12.orig/tools/Makefile ++++ elilo-3.12/tools/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES=eliloalt.o + TARGET=eliloalt +--- elilo-3.12.orig/fs/Makefile ++++ elilo-3.12/fs/Makefile +@@ -23,10 +23,15 @@ + # to use this program. + # + +-include ../Make.defaults +-include ../Make.rules ++SRCDIR = . ++ ++VPATH = $(SRCDIR) ++ ++include $(SRCDIR)/../Make.defaults ++include $(SRCDIR)/../Make.rules ++ ++TOPDIR=$(SRCDIR)/.. + +-TOPDIR=$(CDIR)/.. + + FILES= + ifeq ($(CONFIG_localfs),y) +@@ -55,7 +60,7 @@ all: $(TARGET) + # without doing make clean. + # + $(TARGET): check-filesystems $(TOPDIR)/Make.defaults $(FILES) +- $(LD) -r -o $@ $(FILES) ++ $(LD) $(LD3264) -r -o $@ $(FILES) + + clean: + $(RM) -f $(TARGET) $(FILES) diff --git a/debian/patches/series b/debian/patches/series index 80f5939..7ed73bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-paths.diff +debian-changes-3.12-3 diff --git a/debian/rules b/debian/rules index be2c8ff..eae4874 100755 --- a/debian/rules +++ b/debian/rules @@ -73,6 +73,14 @@ endif cp tools/eliloalt debian/elilo/usr/sbin/eliloalt chmod 0755 debian/elilo/usr/sbin/eliloalt + cp debian/elilo.initramfs-post-update \ + debian/elilo/etc/initramfs/post-update.d/elilo + cp debian/elilo.kernel-postinst \ + debian/elilo/etc/kernel/postinst.d/zz-elilo + cp debian/elilo.kernel-postrm \ + debian/elilo/etc/kernel/postrm.d/zz-elilo + chmod 755 debian/elilo/etc/initramfs/*.d/* debian/elilo/etc/kernel/*.d/* + binary-indep: build install binary-arch: build install diff --git a/devschemes/Makefile b/devschemes/Makefile index 5328cb1..6ac05af 100644 --- a/devschemes/Makefile +++ b/devschemes/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES=simple.o @@ -45,7 +40,7 @@ all: $(TARGET) # without doing make clean. # $(TARGET): $(FILES) - $(LD) $(LD3264) -r -o $@ $(FILES) + $(LD) -r -o $@ $(FILES) clean: $(RM) -f $(TARGET) $(FILES) diff --git a/fs/Makefile b/fs/Makefile index 4c26f71..1829d96 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES= ifeq ($(CONFIG_localfs),y) @@ -60,7 +55,7 @@ all: $(TARGET) # without doing make clean. # $(TARGET): check-filesystems $(TOPDIR)/Make.defaults $(FILES) - $(LD) $(LD3264) -r -o $@ $(FILES) + $(LD) -r -o $@ $(FILES) clean: $(RM) -f $(TARGET) $(FILES) diff --git a/ia32/Makefile b/ia32/Makefile index c5f421b..353ae67 100644 --- a/ia32/Makefile +++ b/ia32/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o @@ -42,13 +37,13 @@ all: $(TARGET) system.o: rmswitch.h rmswitch.h: bin_to_h.c rmswitch.S - $(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c - $(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S + $(CC) -o bin_to_h bin_to_h.c + $(AS) -o rmswitch.o rmswitch.S $(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o ./bin_to_h rmswitch.h $(TARGET): $(FILES) - $(LD) $(LD3264) -r -o $@ $(FILES) + $(LD) -r -o $@ $(FILES) clean: $(RM) -f $(TARGET) $(FILES) diff --git a/ia64/Makefile b/ia64/Makefile index bee0a2b..a243d0f 100644 --- a/ia64/Makefile +++ b/ia64/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES=system.o config.o fpswa.o plain_loader.o gzip_loader.o \ gzip.o memset.o memcpy.o setjmp.o longjmp.o diff --git a/tools/Makefile b/tools/Makefile index 97083d7..8858224 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES=eliloalt.o TARGET=eliloalt diff --git a/x86_64/Makefile b/x86_64/Makefile index 7ade312..4af4b8d 100644 --- a/x86_64/Makefile +++ b/x86_64/Makefile @@ -23,15 +23,10 @@ # to use this program. # -SRCDIR = . - -VPATH = $(SRCDIR) - -include $(SRCDIR)/../Make.defaults -include $(SRCDIR)/../Make.rules - -TOPDIR=$(SRCDIR)/.. +include ../Make.defaults +include ../Make.rules +TOPDIR=$(CDIR)/.. FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o #FILES=system.o config.o plain_loader.o @@ -43,13 +38,13 @@ all: $(TARGET) system.o: rmswitch.h rmswitch.h: bin_to_h.c rmswitch.S - $(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c - $(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S + $(CC) -o bin_to_h bin_to_h.c + $(AS) -o rmswitch.o rmswitch.S $(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o ./bin_to_h rmswitch.h $(TARGET): $(FILES) - $(LD) $(LD3264) -r -o $@ $(FILES) + $(LD) -r -o $@ $(FILES) clean: $(RM) -f $(TARGET) $(FILES)