commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnumach] 01/01: Add stage1 build profile for cross-bootstrapping gnumac


From: Samuel Thibault
Subject: [gnumach] 01/01: Add stage1 build profile for cross-bootstrapping gnumach
Date: Tue, 18 Aug 2015 09:26:56 +0000

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit 18fe92a0b5cd457c601a99538aaa10a7d84ba4e6
Author: Samuel Thibault <address@hidden>
Date:   Tue Aug 18 11:25:12 2015 +0200

    Add stage1 build profile for cross-bootstrapping gnumach
---
 debian/changelog  |  6 ++++++
 debian/control    | 13 ++++++++++++-
 debian/control.in | 13 ++++++++++++-
 debian/rules      | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1437bad..c7e269c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnumach (2:1.5+git20150728-2) unstable; urgency=medium
+
+  * Add stage1 build profile for cross-bootstrapping gnumach.
+
+ -- Samuel Thibault <address@hidden>  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 46d1da2..549f8d0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,13 @@ Uploaders: Samuel Thibault <address@hidden>
 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-486
 Breaks: grub-pc (<< 1.98+20100527-1)
 Description: Dummy transition package for gnumach-image-*
@@ -22,6 +23,7 @@ Package: gnumach-dbg
 Section: debug
 Priority: extra
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-image-1.5-486-dbg
 Breaks: grub-pc (<< 1.98+20100527-1)
 Description: Dummy transition package for gnumach-image-*-dbg
@@ -30,6 +32,7 @@ Description: Dummy transition package for gnumach-image-*-dbg
 
 Package: gnumach-image-1-486
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-image-1.5-486
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
@@ -37,6 +40,7 @@ Description: GNU version of the Mach microkernel
 
 Package: gnumach-image-1-xen-486
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-image-1.5-xen-486
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
@@ -46,6 +50,7 @@ Description: GNU version of the Mach microkernel
 
 Package: gnumach-image-1.5-486
 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~)
@@ -54,6 +59,7 @@ Description: GNU version of the Mach microkernel
 
 Package: gnumach-image-1.5-xen-486
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-common
 Provides: gnumach-image
 Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1)
@@ -68,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
@@ -80,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
@@ -91,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
@@ -105,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
@@ -117,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 b187475..d608858 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,12 +6,13 @@ Uploaders: Samuel Thibault <address@hidden>
 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-486
 Breaks: grub-pc (<< 1.98+20100527-1)
 Description: Dummy transition package for gnumach-image-*
@@ -22,6 +23,7 @@ Package: gnumach-dbg
 Section: debug
 Priority: extra
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, address@hidden@-486-dbg
 Breaks: grub-pc (<< 1.98+20100527-1)
 Description: Dummy transition package for gnumach-image-*-dbg
@@ -30,6 +32,7 @@ Description: Dummy transition package for gnumach-image-*-dbg
 
 Package: gnumach-image-1-486
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, address@hidden@-486
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
@@ -37,6 +40,7 @@ Description: GNU version of the Mach microkernel
 
 Package: gnumach-image-1-xen-486
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, address@hidden@-xen-486
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
@@ -46,6 +50,7 @@ Description: GNU version of the Mach microkernel
 
 Package: address@hidden@-486
 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~)
@@ -54,6 +59,7 @@ Description: GNU version of the Mach microkernel
 
 Package: address@hidden@-xen-486
 Architecture: any-i386
+Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-common
 Provides: gnumach-image
 Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1)
@@ -68,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
@@ -80,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
@@ -91,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
@@ -105,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
@@ -117,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/rules b/debian/rules
index 6e0b453..28898cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,12 @@ D_DBG := $(D)-dbg
 D_XEN_DBG := $(D)-xen-dbg
 
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+else
+# We will only install headers, don't care about the target
+DEB_HOST_GNU_TYPE := i586-gnu
+endif
 
 CFLAGS = -Wall -g -pipe -fno-strict-aliasing
 
@@ -109,9 +114,15 @@ build-xen-dbg/config.status: configure
                $(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
 build-indep: build-arch
 build: build-arch build-indep
+else
+build-arch: build/config.status
+build-indep: build-arch
+build: build-arch build-indep
+endif
 
 doc/mach.info: build/config.status
        dh_testdir
@@ -185,6 +196,7 @@ install: build
        -rm -rf $(D_DBG)
        dh_installdirs -a
        
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
        $(MAKE) -C build install \
                DESTDIR=$(D)
        
@@ -218,6 +230,10 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
                done ; \
        done
 endif
+else
+       $(MAKE) -C build install-data \
+               DESTDIR=$(D)
+endif
 
 binary: binary-indep binary-arch
 
@@ -263,6 +279,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)
@@ -271,6 +288,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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git



reply via email to

[Prev in Thread] Current Thread [Next in Thread]