diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 51 | ||||
| -rw-r--r-- | debian/control.in | 31 | ||||
| -rw-r--r-- | debian/patches/50_initrd.patch | 40 | ||||
| -rw-r--r-- | debian/patches/70_dde.patch | 61 | ||||
| -rwxr-xr-x | debian/rules | 15 |
6 files changed, 117 insertions, 90 deletions
diff --git a/debian/changelog b/debian/changelog index 1437bad..7573da9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnumach (2:1.5+git20150827-1) unstable; urgency=medium + + * New upstream snapshot. + * Add stage1 build profile for cross-bootstrapping gnumach. Bump dpkg-dev + and debhelper build-dependency versions accordingly + * patches/70_dde.patch: Also install intr.h. Closes: Bug#795770. + + -- Samuel Thibault <sthibault@debian.org> Tue, 18 Aug 2015 11:24:24 +0200 + gnumach (2:1.5+git20150728-1) unstable; urgency=medium * New upstream snapshot. diff --git a/debian/control b/debian/control index 9f2eada..a5feb0d 100644 --- a/debian/control +++ b/debian/control @@ -6,12 +6,13 @@ Uploaders: Samuel Thibault <sthibault@debian.org> Homepage: http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/gnumach.git Vcs-Git: git://anonscm.debian.org/pkg-hurd/gnumach.git -Build-Depends: debhelper (>= 7), mig (>= 1.4-2), sharutils, +Build-Depends: debhelper (>= 7), mig (>= 1.4-2) <!stage1>, sharutils, autoconf, automake, texinfo Standards-Version: 3.9.6 Package: gnumach Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-image-1-686 Breaks: grub-pc (<< 1.98+20100527-1) Description: Dummy transition package for gnumach-image-* @@ -22,7 +23,8 @@ Package: gnumach-dbg Section: debug Priority: extra Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-1-686-dbg +Build-Profiles: <!stage1> +Depends: ${misc:Depends}, gnumach-image-1.5-686-dbg Breaks: grub-pc (<< 1.98+20100527-1) Description: Dummy transition package for gnumach-image-*-dbg This is a dummy package to ease the transition to gnumach-image-*dbg @@ -30,46 +32,34 @@ Description: Dummy transition package for gnumach-image-*-dbg Package: gnumach-image-1-686 Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-1.4-686 +Build-Profiles: <!stage1> +Depends: ${misc:Depends}, gnumach-image-1.5-686 Description: GNU version of the Mach microkernel This package depends on the latest GNU Mach kernel for use on PCs with a 686, Pentium or compatible processor. -Package: gnumach-image-1-686-dbg -Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-1.4-686-dbg -Description: GNU version of the Mach microkernel - This package depends on the latest GNU Mach kernel for use on PCs - with a 686, Pentium or compatible processor, debug version. - Package: gnumach-image-1-xen-686 Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-1.4-xen-686 +Build-Profiles: <!stage1> +Depends: ${misc:Depends}, gnumach-image-1.5-xen-686 Description: GNU version of the Mach microkernel This package depends on the latest GNU Mach kernel for use on PCs with a 686, Pentium or compatible processor. . This kernel is for use in unprivileged (domU) Xen domains. -Package: gnumach-image-1-xen-686-dbg -Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-1.4-xen-686-dbg -Description: GNU version of the Mach microkernel - This package depends on the latest GNU Mach kernel for use on PCs - with a 686, Pentium or compatible processor, debug version. - . - This kernel is for use in unprivileged (domU) Xen domains. - -Package: gnumach-image-1.4-686 +Package: gnumach-image-1.5-686 Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Provides: gnumach-image Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 2:1.9.99.1~) Description: GNU version of the Mach microkernel This is the Utah Mach microkernel used by the Hurd. -Package: gnumach-image-1.4-xen-686 +Package: gnumach-image-1.5-xen-686 Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Provides: gnumach-image Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1) @@ -78,35 +68,38 @@ Description: GNU version of the Mach microkernel for Xen . The version in this package is compiled with Xen support. -Package: kernel-image-1.4-686-di -XB-Kernel-Version: 1.4-686 +Package: kernel-image-1.5-686-di +XB-Kernel-Version: 1.5-686 Package-Type: udeb Provides: kernel-image, floppy-modules, ide-modules, input-modules, scsi-modules, serial-modules Section: debian-installer Architecture: hurd-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, hurd-udeb Description: GNU version of the Mach microkernel for the Debian installer This is the Utah Mach microkernel used by the Hurd for the Debian Installer boot images. It does _not_ provide a usable kernel for your full Debian system. -Package: kernel-image-1.4-xen-686-di -XB-Kernel-Version: 1.4-xen-686 +Package: kernel-image-1.5-xen-686-di +XB-Kernel-Version: 1.5-xen-686 Package-Type: udeb Provides: kernel-image, input-modules Section: debian-installer Architecture: hurd-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, hurd-udeb Description: GNU version of the Mach microkernel for the Debian installer This is the Utah Mach microkernel used by the Hurd for the Debian Installer boot images. It does _not_ provide a usable kernel for your full Debian system. -Package: gnumach-image-1.4-686-dbg +Package: gnumach-image-1.5-686-dbg Section: debug Priority: extra Provides: gnumach Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 2:1.9.99.1~) Description: GNU version of the Mach microkernel for debugging @@ -116,11 +109,12 @@ Description: GNU version of the Mach microkernel for debugging gnumach package, except that it is not stripped and has the kernel-level debugger compiled in. -Package: gnumach-image-1.4-xen-686-dbg +Package: gnumach-image-1.5-xen-686-dbg Section: debug Priority: extra Provides: gnumach Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1) Description: GNU version of the Mach microkernel for Xen for debugging @@ -133,6 +127,7 @@ Description: GNU version of the Mach microkernel for Xen for debugging Package: gnumach-common Section: devel Architecture: all +Build-Profiles: <!stage1> Multi-Arch: foreign Depends: ${misc:Depends} Replaces: gnumach (<< 2:1.3.99.dfsg.git20110227-1) diff --git a/debian/control.in b/debian/control.in index ecf0116..e190252 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,12 +6,13 @@ Uploaders: Samuel Thibault <sthibault@debian.org> Homepage: http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/gnumach.git Vcs-Git: git://anonscm.debian.org/pkg-hurd/gnumach.git -Build-Depends: debhelper (>= 7), mig (>= 1.4-2), sharutils, +Build-Depends: debhelper (>= 7), mig (>= 1.4-2) <!stage1>, sharutils, autoconf, automake, texinfo Standards-Version: 3.9.6 Package: gnumach Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-image-1-686 Breaks: grub-pc (<< 1.98+20100527-1) Description: Dummy transition package for gnumach-image-* @@ -22,7 +23,8 @@ Package: gnumach-dbg Section: debug Priority: extra Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-1-686-dbg +Build-Profiles: <!stage1> +Depends: ${misc:Depends}, gnumach-image-@version@-686-dbg Breaks: grub-pc (<< 1.98+20100527-1) Description: Dummy transition package for gnumach-image-*-dbg This is a dummy package to ease the transition to gnumach-image-*dbg @@ -30,20 +32,15 @@ Description: Dummy transition package for gnumach-image-*-dbg Package: gnumach-image-1-686 Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-image-@version@-686 Description: GNU version of the Mach microkernel This package depends on the latest GNU Mach kernel for use on PCs with a 686, Pentium or compatible processor. -Package: gnumach-image-1-686-dbg -Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-@version@-686-dbg -Description: GNU version of the Mach microkernel - This package depends on the latest GNU Mach kernel for use on PCs - with a 686, Pentium or compatible processor, debug version. - Package: gnumach-image-1-xen-686 Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-image-@version@-xen-686 Description: GNU version of the Mach microkernel This package depends on the latest GNU Mach kernel for use on PCs @@ -51,17 +48,9 @@ Description: GNU version of the Mach microkernel . This kernel is for use in unprivileged (domU) Xen domains. -Package: gnumach-image-1-xen-686-dbg -Architecture: any-i386 -Depends: ${misc:Depends}, gnumach-image-@version@-xen-686-dbg -Description: GNU version of the Mach microkernel - This package depends on the latest GNU Mach kernel for use on PCs - with a 686, Pentium or compatible processor, debug version. - . - This kernel is for use in unprivileged (domU) Xen domains. - Package: gnumach-image-@version@-686 Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Provides: gnumach-image Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 2:1.9.99.1~) @@ -70,6 +59,7 @@ Description: GNU version of the Mach microkernel Package: gnumach-image-@version@-xen-686 Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Provides: gnumach-image Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1) @@ -84,6 +74,7 @@ Package-Type: udeb Provides: kernel-image, floppy-modules, ide-modules, input-modules, scsi-modules, serial-modules Section: debian-installer Architecture: hurd-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, hurd-udeb Description: GNU version of the Mach microkernel for the Debian installer This is the Utah Mach microkernel used by the Hurd for the Debian @@ -96,6 +87,7 @@ Package-Type: udeb Provides: kernel-image, input-modules Section: debian-installer Architecture: hurd-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, hurd-udeb Description: GNU version of the Mach microkernel for the Debian installer This is the Utah Mach microkernel used by the Hurd for the Debian @@ -107,6 +99,7 @@ Section: debug Priority: extra Provides: gnumach Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 2:1.9.99.1~) Description: GNU version of the Mach microkernel for debugging @@ -121,6 +114,7 @@ Section: debug Priority: extra Provides: gnumach Architecture: any-i386 +Build-Profiles: <!stage1> Depends: ${misc:Depends}, gnumach-common Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1) Description: GNU version of the Mach microkernel for Xen for debugging @@ -133,6 +127,7 @@ Description: GNU version of the Mach microkernel for Xen for debugging Package: gnumach-common Section: devel Architecture: all +Build-Profiles: <!stage1> Multi-Arch: foreign Depends: ${misc:Depends} Replaces: gnumach (<< 2:1.3.99.dfsg.git20110227-1) diff --git a/debian/patches/50_initrd.patch b/debian/patches/50_initrd.patch index c438757..626ca56 100644 --- a/debian/patches/50_initrd.patch +++ b/debian/patches/50_initrd.patch @@ -1,9 +1,11 @@ Jérémie Koenig <jk@jk.fr.eu.org> Add ramdisk support for d-i. ---- a/Makefrag.am -+++ b/Makefrag.am -@@ -306,6 +306,8 @@ libkernel_a_SOURCES += \ +Index: gnumach-1.4+git20141107/Makefrag.am +=================================================================== +--- gnumach-1.4+git20141107.orig/Makefrag.am ++++ gnumach-1.4+git20141107/Makefrag.am +@@ -308,6 +308,8 @@ libkernel_a_SOURCES += \ device/net_io.c \ device/net_io.h \ device/param.h \ @@ -12,8 +14,10 @@ Add ramdisk support for d-i. device/subrs.c \ device/subrs.h \ device/tty.h ---- a/i386/i386at/conf.c -+++ b/i386/i386at/conf.c +Index: gnumach-1.4+git20141107/i386/i386at/conf.c +=================================================================== +--- gnumach-1.4+git20141107.orig/i386/i386at/conf.c ++++ gnumach-1.4+git20141107/i386/i386at/conf.c @@ -31,6 +31,7 @@ #include <device/conf.h> #include <kern/mach_clock.h> @@ -30,10 +34,12 @@ Add ramdisk support for d-i. + #ifdef MACH_KMSG { kmsgname, kmsgopen, kmsgclose, kmsgread, - nodev, kmsggetstat, nodev, nomap, ---- a/kern/boot_script.c -+++ b/kern/boot_script.c -@@ -88,12 +88,20 @@ prompt_resume_task (struct cmd *cmd, lon + nulldev_write, kmsggetstat, nulldev_setstat, nomap, +Index: gnumach-1.4+git20141107/kern/boot_script.c +=================================================================== +--- gnumach-1.4+git20141107.orig/kern/boot_script.c ++++ gnumach-1.4+git20141107/kern/boot_script.c +@@ -88,12 +88,20 @@ prompt_resume_task (struct cmd *cmd, con return boot_script_prompt_task_resume (cmd); } @@ -54,8 +60,10 @@ Add ramdisk support for d-i. }; #define NUM_BUILTIN (sizeof (builtin_symbols) / sizeof (builtin_symbols[0])) ---- a/kern/bootstrap.c -+++ b/kern/bootstrap.c +Index: gnumach-1.4+git20141107/kern/bootstrap.c +=================================================================== +--- gnumach-1.4+git20141107.orig/kern/bootstrap.c ++++ gnumach-1.4+git20141107/kern/bootstrap.c @@ -51,6 +51,7 @@ #include <vm/vm_user.h> #include <vm/pmap.h> @@ -64,7 +72,7 @@ Add ramdisk support for d-i. #if MACH_KDB #include <machine/db_machdep.h> -@@ -796,6 +797,23 @@ boot_script_free (void *ptr, unsigned in +@@ -792,6 +793,23 @@ boot_script_free (void *ptr, unsigned in } int @@ -88,8 +96,10 @@ Add ramdisk support for d-i. boot_script_task_create (struct cmd *cmd) { kern_return_t rc = task_create(TASK_NULL, FALSE, &cmd->task); +Index: gnumach-1.4+git20141107/device/ramdisk.c +=================================================================== --- /dev/null -+++ b/device/ramdisk.c ++++ gnumach-1.4+git20141107/device/ramdisk.c @@ -0,0 +1,160 @@ +#include <mach/vm_param.h> +#include <machine/vm_param.h> @@ -251,8 +261,10 @@ Add ramdisk support for d-i. + return pmap_phys_to_frame(kvtophys((vm_offset_t) ramdisk[dev].data + off)); +} + +Index: gnumach-1.4+git20141107/device/ramdisk.h +=================================================================== --- /dev/null -+++ b/device/ramdisk.h ++++ gnumach-1.4+git20141107/device/ramdisk.h @@ -0,0 +1,47 @@ +#ifndef _KERN_RAMDISK_H_ +#define _KERN_RAMDISK_H_ diff --git a/debian/patches/70_dde.patch b/debian/patches/70_dde.patch index d7c477c..8d6a7fe 100644 --- a/debian/patches/70_dde.patch +++ b/debian/patches/70_dde.patch @@ -1,14 +1,14 @@ --- a/Makefrag.am +++ b/Makefrag.am -@@ -218,6 +218,7 @@ EXTRA_DIST += \ +@@ -220,6 +220,7 @@ EXTRA_DIST += \ kern/mach.srv \ kern/mach4.srv \ kern/gnumach.srv \ + kern/experimental.srv \ kern/mach_debug.srv \ - kern/mach_host.srv - -@@ -300,6 +301,7 @@ libkernel_a_SOURCES += \ + kern/mach_host.srv \ + kern/task_notify.cli +@@ -303,6 +304,7 @@ libkernel_a_SOURCES += \ device/device_types_kernel.h \ device/ds_routines.c \ device/ds_routines.h \ @@ -16,7 +16,15 @@ device/if_ether.h \ device/if_hdr.h \ device/io_req.h \ -@@ -371,6 +373,7 @@ include_mach_HEADERS = \ +@@ -353,6 +355,7 @@ include_device_HEADERS = \ + include/device/device_types.defs \ + include/device/device_types.h \ + include/device/disk_status.h \ ++ include/device/intr.h \ + include/device/net_status.h \ + include/device/tape_status.h \ + include/device/tty_status.h +@@ -375,6 +378,7 @@ include_mach_HEADERS = \ include/mach/memory_object_default.defs \ include/mach/notify.defs \ include/mach/std_types.defs \ @@ -24,7 +32,7 @@ include/mach/alert.h \ include/mach/boolean.h \ include/mach/boot.h \ -@@ -503,6 +506,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += +@@ -523,6 +527,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += kern/mach.server.defs.c \ kern/mach4.server.defs.c \ kern/gnumach.server.defs.c \ @@ -32,7 +40,7 @@ kern/mach_debug.server.defs.c \ kern/mach_host.server.defs.c nodist_libkernel_a_SOURCES += \ -@@ -515,6 +519,9 @@ nodist_libkernel_a_SOURCES += \ +@@ -535,6 +540,9 @@ nodist_libkernel_a_SOURCES += \ kern/gnumach.server.h \ kern/gnumach.server.c \ kern/gnumach.server.msgids \ @@ -42,7 +50,7 @@ kern/mach_debug.server.h \ kern/mach_debug.server.c \ kern/mach_debug.server.msgids \ -@@ -524,6 +531,7 @@ nodist_libkernel_a_SOURCES += \ +@@ -544,6 +552,7 @@ nodist_libkernel_a_SOURCES += \ # kern/mach.server.defs # kern/mach4.server.defs # kern/gnumach.server.defs @@ -96,7 +104,7 @@ boolean_t ds_notify (mach_msg_header_t *msg) { -@@ -1806,6 +1843,24 @@ device_writev_trap (mach_device_t device +@@ -1798,6 +1835,24 @@ device_writev_trap (mach_device_t device return (result); } @@ -463,16 +471,15 @@ +#endif --- a/kern/startup.c +++ b/kern/startup.c -@@ -76,6 +76,8 @@ boolean_t reboot_on_panic = TRUE; - #include <kern/machine.h> - #endif /* NCPUS > 1 */ - -+extern void intr_thread(); -+ +@@ -79,6 +79,7 @@ boolean_t reboot_on_panic = TRUE; /* XX */ extern vm_offset_t phys_first_addr, phys_last_addr; extern char *kernel_cmdline; -@@ -221,6 +223,9 @@ void start_kernel_threads(void) ++extern void intr_thread(); + + /* + * Running in virtual memory, on the interrupt stack. +@@ -221,6 +222,9 @@ void start_kernel_threads(void) (void) kernel_thread(kernel_task, reaper_thread, (char *) 0); (void) kernel_thread(kernel_task, swapin_thread, (char *) 0); (void) kernel_thread(kernel_task, sched_thread, (char *) 0); @@ -609,7 +616,7 @@ if (retval) --- a/vm/vm_user.c +++ b/vm/vm_user.c -@@ -436,3 +436,117 @@ kern_return_t vm_wire(host, map, start, +@@ -452,3 +452,117 @@ kern_return_t vm_wire(port, map, start, round_page(start+size), access); } @@ -729,7 +736,7 @@ +} --- a/linux/dev/drivers/block/genhd.c +++ b/linux/dev/drivers/block/genhd.c -@@ -786,7 +786,9 @@ void device_setup(void) +@@ -812,7 +812,9 @@ void device_setup(void) #ifdef MACH linux_intr_pri = SPL6; #endif @@ -742,15 +749,15 @@ console_map_init(); --- a/kern/ipc_kobject.c +++ b/kern/ipc_kobject.c -@@ -56,6 +56,7 @@ - #include <device/device_pager.server.h> - #include <kern/mach4.server.h> - #include <kern/gnumach.server.h> -+#include <kern/experimental.server.h> - - #if MACH_DEBUG - #include <kern/mach_debug.server.h> -@@ -173,6 +174,7 @@ ipc_kobject_server(request) +@@ -159,6 +159,7 @@ ipc_kobject_server(request) + * to perform the kernel function + */ + { ++ extern mig_routine_t experimental_server_routine(); + check_simple_locks(); + if ((routine = mach_server_routine(&request->ikm_header)) != 0 + || (routine = mach_port_server_routine(&request->ikm_header)) != 0 +@@ -170,6 +171,7 @@ ipc_kobject_server(request) #endif /* MACH_DEBUG */ || (routine = mach4_server_routine(&request->ikm_header)) != 0 || (routine = gnumach_server_routine(&request->ikm_header)) != 0 diff --git a/debian/rules b/debian/rules index e14d9d8..f4e4c28 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ D_XEN_DBG := $(D)-xen-dbg DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -CFLAGS = -Wall -g -pipe -fno-strict-aliasing -march=i$(MACHINE) +CFLAGS = -Wall -g -pipe -fno-strict-aliasing ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -99,7 +99,6 @@ build-dbg/config.status: configure -mkdir build-dbg cd build-dbg && PACKAGE_VERSION_SUFFIX=-686-dbg ../configure --enable-kdb $(drivers) \ - CFLAGS="$(CFLAGS)" \ $(common_configure) \ build-xen-dbg/config.status: configure @@ -107,11 +106,14 @@ build-xen-dbg/config.status: configure -mkdir build-xen-dbg cd build-xen-dbg && PACKAGE_VERSION_SUFFIX=-xen-686-dbg ../configure --enable-kdb \ - CFLAGS="$(CFLAGS)" \ $(common_configure) \ --enable-platform=xen +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) build-arch: build/stamp build-xen/stamp build-dbg/stamp build-xen-dbg/stamp +else +build-arch: build/config.status +endif build-indep: build-arch build: build-arch build-indep @@ -187,6 +189,7 @@ install: build -rm -rf $(D_DBG) dh_installdirs -a +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) $(MAKE) -C build install \ DESTDIR=$(D) @@ -220,6 +223,10 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd) done ; \ done endif +else + $(MAKE) -C build install-data \ + DESTDIR=$(D) +endif binary: binary-indep binary-arch @@ -265,6 +272,7 @@ endif dh_link -a dh_strip -a -N$(pkg_dbg) -N$(pkg_xen_dbg) dh_compress -a -N$(pkg) -N$(pkg_udeb) -N$(pkg_xen) -N$(pkg_xen_udeb) -N$(pkg_dbg) -N$(pkg_xen_dbg) +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) dh_compress -p$(pkg) boot/gnumach-$(VERSION)-$(MACHINE) dh_compress -p$(pkg_xen) boot/gnumach-$(VERSION)-xen-$(MACHINE) ifeq ($(DEB_HOST_ARCH_OS),hurd) @@ -273,6 +281,7 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd) endif dh_compress -p$(pkg_dbg) boot/gnumach-$(VERSION)-$(MACHINE)-dbg dh_compress -p$(pkg_xen_dbg) boot/gnumach-$(VERSION)-xen-$(MACHINE)-dbg +endif dh_fixperms -a dh_installdeb -a dh_gencontrol -a |