This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository gnumach.
commit b9f73835ce111c81043cca70f86a3397be98e04c Author: Samuel Thibault <[email protected]> Date: Tue Nov 15 00:25:05 2016 +0000 {git-LDFLAGS,git-unregister-boot-data.patch}: Drop merged upstream. --- debian/changelog | 2 + debian/patches/git-LDFLAGS | 52 ---------------------- debian/patches/git-unregister-boot-data.patch | 62 --------------------------- debian/patches/series | 2 - 4 files changed, 2 insertions(+), 116 deletions(-) diff --git a/debian/changelog b/debian/changelog index 87f3c2c..7546247 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ gnumach (2:1.7+git20161115-1) UNRELEASED; urgency=medium * New upstream snapshot. * copyright: Add missing licence terms. Closes: Bug#792622. + * patches/{git-LDFLAGS,git-unregister-boot-data.patch}: Drop, merged + upstream. -- Samuel Thibault <[email protected]> Tue, 15 Nov 2016 00:23:19 +0000 diff --git a/debian/patches/git-LDFLAGS b/debian/patches/git-LDFLAGS deleted file mode 100644 index 4f02d19..0000000 --- a/debian/patches/git-LDFLAGS +++ /dev/null @@ -1,52 +0,0 @@ -commit fd2c9fee9ca6c6452baed86ed61b03cdea5f8628 -Author: Samuel Thibault <[email protected]> -Date: Mon Oct 24 20:11:15 2016 +0200 - - Fix taking LDFLAGS into account - - * Makefile.am (gnumach_o_LINK, gnumach_LINK): Add $(LDFLAGS). - -diff --git a/Makefile.am b/Makefile.am -index 50ff6b6..ff23c32 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -156,7 +156,7 @@ include doc/Makefrag.am - # program `gnumach.o' that is then later used again as an object file.) - gnumach_o_SOURCES = - # TODO. ``-u _start''. System dependent? --gnumach_o_LINK = $(LD) -u _start -r -o $@ -+gnumach_o_LINK = $(LD) $(LDFLAGS) -u _start -r -o $@ - noinst_PROGRAMS += \ - gnumach.o - -@@ -181,7 +181,7 @@ clib-routines.o: gnumach-undef gnumach-undef-bad - then echo "Please install a 32bit libc without multiarch support (on Debian systems, the libc6-dev:i386 package containing /usr/lib/i386-linux-gnu/libc.a)". ; \ - false ; fi - --gnumach_LINK = $(LD) $(LINKFLAGS) $(gnumach_LINKFLAGS) -o $@ -+gnumach_LINK = $(LD) $(LDFLAGS) $(LINKFLAGS) $(gnumach_LINKFLAGS) -o $@ - gnumach_LDADD = gnumach.o clib-routines.o - - # - -commit 0842c5e85ab2b049af7b44ce2196362bdce80c97 -Author: Samuel Thibault <[email protected]> -Date: Mon Oct 24 21:05:18 2016 +0200 - - Fix taking LDFLAGS into account - - * Makefile.am (clib-routines.o): Add $(LDFLAGS) to link command. - -diff --git a/Makefile.am b/Makefile.am -index ff23c32..67252db 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -175,7 +175,7 @@ MOSTLYCLEANFILES += gnumach-undef-bad - clib-routines.o: gnumach-undef gnumach-undef-bad - $(AM_V_at) if test -s gnumach-undef-bad; \ - then cat gnumach-undef-bad; exit 2; else true; fi -- $(AM_V_CCLD) $(CCLD) -nostdlib -nostartfiles -r -static \ -+ $(AM_V_CCLD) $(CCLD) $(LDFLAGS) -nostdlib -nostartfiles -r -static \ - -o $@ `sed 's/^/-Wl,-u,/' < $<` -x c /dev/null -lc -lgcc - @if nm $@ | grep __init_cpu_features; \ - then echo "Please install a 32bit libc without multiarch support (on Debian systems, the libc6-dev:i386 package containing /usr/lib/i386-linux-gnu/libc.a)". ; \ diff --git a/debian/patches/git-unregister-boot-data.patch b/debian/patches/git-unregister-boot-data.patch deleted file mode 100644 index df5062f..0000000 --- a/debian/patches/git-unregister-boot-data.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit f6c9a501febff628fe542ee17ab3d789a4de2ac1 -Author: Samuel Thibault <[email protected]> -Date: Mon Oct 31 00:35:57 2016 +0100 - - Make multiboot cmdline and modules non-permanent reservations - - * i386/i386at/model_dep.c (register_boot_data): For multiboot cmdline, - module structure, module data and module strings, set - biosmem_register_boot_data temporary parameter to TRUE. - -diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c -index 239f63f..f57df63 100644 ---- a/i386/i386at/model_dep.c -+++ b/i386/i386at/model_dep.c -@@ -280,31 +280,31 @@ register_boot_data(const struct multiboot_raw_info *mbi) - - extern char _start[], _end[]; - -- /* XXX For now, register all boot data as permanent */ -- - biosmem_register_boot_data(_kvtophys(&_start), _kvtophys(&_end), FALSE); - -+ /* cmdline and modules are moved to a safe place by i386at_init. */ -+ - if ((mbi->flags & MULTIBOOT_LOADER_CMDLINE) && (mbi->cmdline != 0)) { - biosmem_register_boot_data(mbi->cmdline, - mbi->cmdline -- + strlen((void *)phystokv(mbi->cmdline)) + 1, FALSE); -+ + strlen((void *)phystokv(mbi->cmdline)) + 1, TRUE); - } - - if (mbi->flags & MULTIBOOT_LOADER_MODULES) { - i = mbi->mods_count * sizeof(struct multiboot_raw_module); -- biosmem_register_boot_data(mbi->mods_addr, mbi->mods_addr + i, FALSE); -+ biosmem_register_boot_data(mbi->mods_addr, mbi->mods_addr + i, TRUE); - - tmp = phystokv(mbi->mods_addr); - - for (i = 0; i < mbi->mods_count; i++) { - mod = (struct multiboot_raw_module *)tmp + i; -- biosmem_register_boot_data(mod->mod_start, mod->mod_end, FALSE); -+ biosmem_register_boot_data(mod->mod_start, mod->mod_end, TRUE); - - if (mod->string != 0) { - biosmem_register_boot_data(mod->string, - mod->string - + strlen((void *)phystokv(mod->string)) + 1, -- FALSE); -+ TRUE); - } - } - } -@@ -364,7 +364,8 @@ i386at_init(void) - kernel_cmdline = (char*) boot_info.cmd_line; - #else /* MACH_XEN */ - /* Copy content pointed by boot_info before losing access to it when it -- * is too far in physical memory. */ -+ * is too far in physical memory. -+ * Also avoids leaving them in precious areas such as DMA memory. */ - if (boot_info.flags & MULTIBOOT_CMDLINE) { - int len = strlen ((char*)phystokv(boot_info.cmdline)) + 1; - if (! init_alloc_aligned(round_page(len), &addr)) diff --git a/debian/patches/series b/debian/patches/series index b2cca97..418767b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,3 @@ 20_FP_NO.patch 50_initrd.patch 70_dde.patch -git-LDFLAGS -git-unregister-boot-data.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/gnumach.git
