[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Add stage2 build profiles for cross-bootstrapping hurd
From: |
Samuel Thibault |
Subject: |
[hurd] 01/01: Add stage2 build profiles for cross-bootstrapping hurd |
Date: |
Tue, 18 Aug 2015 19:38:26 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit ba3b6d139b1ec0e79a50b574a038107103d5ea03
Author: Samuel Thibault <address@hidden>
Date: Tue Aug 18 21:35:31 2015 +0200
Add stage2 build profiles for cross-bootstrapping hurd
---
debian/changelog | 2 +-
debian/control | 22 +++++++++++-----------
debian/hurd-dev.install.in | 18 +++++++++---------
debian/rules | 30 ++++++++++++++++++------------
4 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1bd7394..87af9f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ hurd (1:0.6.git20150704-4) UNRELEASED; urgency=medium
* Upgrade to compat 9.
* Add a noudeb build profile.
- * Add stage1 build profile for cross-bootstrapping hurd.
+ * Add stage1 and stage2 build profiles for cross-bootstrapping hurd.
-- Samuel Thibault <address@hidden> Tue, 18 Aug 2015 10:50:47 +0000
diff --git a/debian/control b/debian/control
index 82f6d16..e9b1d70 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: admin
Priority: required
Maintainer: GNU Hurd Maintainers <address@hidden>
Standards-Version: 3.9.6
-Build-Depends: mig (>= 1.4-3~) <!stage1>, gnumach-dev (>= 1.4+git20141109~)
<!stage1>,
- libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1>,
+Build-Depends: mig (>= 1.4-3~) <!stage1 !stage2>, gnumach-dev (>=
1.4+git20141109~) <!stage1 !stage2>,
+ libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1
!stage2>,
debhelper (>= 7.0.50~), dh-exec (>= 0.15), autoconf, dh-autoreconf,
- libparted-dev <!stage1>, libpciaccess-dev <!stage1>, libx11-dev <!stage1>,
x11proto-core-dev <!stage1>, pkg-config <!stage1>,
- xkb-data <!stage1>, gawk, flex, bison, autotools-dev, libdaemon-dev
<!stage1>, libpcap0.8-dev <!stage1>,
- zlib1g-dev <!stage1>, libbz2-dev <!stage1>, uuid-dev <!stage1>, libblkid-dev
<!stage1>
+ libparted-dev <!stage1 !stage2>, libpciaccess-dev <!stage1 !stage2>,
libx11-dev <!stage1 !stage2>, x11proto-core-dev <!stage1 !stage2>, pkg-config
<!stage1 !stage2>,
+ xkb-data <!stage1 !stage2>, gawk, flex, bison, autotools-dev, libdaemon-dev
<!stage1 !stage2>, libpcap0.8-dev <!stage1 !stage2>,
+ zlib1g-dev <!stage1 !stage2>, libbz2-dev <!stage1 !stage2>, uuid-dev <!stage1
!stage2>, libblkid-dev <!stage1 !stage2>
Uploaders: Michael Banck <address@hidden>,
Samuel Thibault <address@hidden>
Homepage: http://www.gnu.org/software/hurd/hurd.html
@@ -21,7 +21,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: netdde (<< 0.0.20121127-3+)
Architecture: hurd-any
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !stage2>
Multi-Arch: same
Description: GNU Hurd (libraries)
This package contains the libraries used by GNU Hurd.
@@ -38,7 +38,7 @@ Provides: makedev, login, console-driver-xkb
Replaces: makedev, login (<< 1:4.0.14-4), random-egd, console-driver-xkb
Conflicts: makedev, login (<< 1:4.0.14-4), console-driver-xkb
Architecture: hurd-any
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !stage2>
Description: GNU Hurd
This is the GNU Hurd package. It contains essential system software and
libraries.
@@ -58,7 +58,7 @@ Package: hurd-dbg
Priority: extra
Section: debug
Architecture: hurd-any
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !stage2>
Depends: ${misc:Depends}, hurd (= ${binary:Version})
Description: GNU Hurd (debugging files)
This package includes the unstripped binaries and libraries.
@@ -67,7 +67,7 @@ Package: hurd-doc
Priority: optional
Section: doc
Architecture: all
-Build-Profiles: <!stage1>
+Build-Profiles: <!stage1 !stage2>
Depends: ${misc:Depends}
Suggests: www-browser
Description: GNU Hurd manual
@@ -78,7 +78,7 @@ Section: debian-installer
Package-Type: udeb
Priority: optional
Architecture: hurd-any
-Build-Profiles: <!noudeb !stage1>
+Build-Profiles: <!noudeb !stage1 !stage2>
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: GNU Hurd (libraries) - udeb
This package contains the libraries used by GNU Hurd udeb.
@@ -88,7 +88,7 @@ Package-Type: udeb
Priority: optional
Section: debian-installer
Architecture: hurd-any
-Build-Profiles: <!noudeb !stage1>
+Build-Profiles: <!noudeb !stage1 !stage2>
Depends: ${misc:Depends}, ${shlibs:Depends}, hurd-libs0.3-udeb (=
${binary:Version}), xkb-data-udeb
Built-Using: ${built-using}
Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules,
loop-modules, mouse-modules, nfs-modules, socket-modules
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index cfcb7e5..08001be 100755
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,12 +1,12 @@
#! /usr/bin/dh-exec
-<!stage1> ../../libdde-linux26/Makeconf* usr/share/libdde_linux26
-<!stage1> ../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
-<!stage1> ../../libdde-linux26/mk usr/share/libdde_linux26
-<!stage1> ../local/cdrom.h usr/include/sys
-<!stage1> ../local/soundcard.h usr/include/sys
-<!stage1> bin/fstests
-<!stage1> bin/timertest
+<!stage1 !stage2> ../../libdde-linux26/Makeconf* usr/share/libdde_linux26
+<!stage1 !stage2> ../../libdde-linux26/lib/src/libdde_*.a
usr/lib/@DEB_HOST_MULTIARCH@
+<!stage1 !stage2> ../../libdde-linux26/mk usr/share/libdde_linux26
+<!stage1 !stage2> ../local/cdrom.h usr/include/sys
+<!stage1 !stage2> ../local/soundcard.h usr/include/sys
+<!stage1 !stage2> bin/fstests
+<!stage1 !stage2> bin/timertest
include/* usr/include
<!stage1> lib/@DEB_HOST_MULTIARCH@/*.a
-<!stage1> lib/@DEB_HOST_MULTIARCH@/*.so
-<!stage1> usr/share/libdde_linux26/build usr/share/libdde_linux26
+<!stage1 !stage2> lib/@DEB_HOST_MULTIARCH@/*.so
+<!stage1 !stage2> usr/share/libdde_linux26/build usr/share/libdde_linux26
diff --git a/debian/rules b/debian/rules
index efdc9c5..b2e88bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@
DEB_DESTDIR = $(CURDIR)/debian/tmp
DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
else
CONFIGURE_ARGS = \
@@ -49,25 +49,28 @@ BUILT_USING := $(shell dpkg-query -f '$${source:Package} (=
$${source:Version}),
override_dh_auto_configure:
dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS)
$(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure)
-ifeq (,$(filter stage1 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS)
$(CONFIGURE_ARGS_udeb) $(shell dpkg-buildflags --export=configure)
endif
override_dh_auto_build:
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
- dh_auto_build -Bbuild-deb
+ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+ :
+else
+ifneq (,$(filter stage2,$(DEB_BUILD_PROFILES)))
+ $(MAKE) -C build-deb/libihash libihash.a
+else
ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_build -Bbuild-udeb
endif
cd build-deb/doc && make && makeinfo --html --split=chapter
../../doc/hurd.texi
$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS=
-else
- :
+endif
endif
override_dh_auto_clean:
dh_auto_clean -Bbuild-deb
-ifeq (,$(filter stage1 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_clean -Bbuild-udeb
endif
$(MAKE) -C libdde-linux26 cleanall
@@ -77,8 +80,11 @@ endif
rm -f $(INSTALL_generated)
override_dh_auto_install:
-ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
$(MAKE) -Cbuild-deb prefix=$(DEB_DESTDIR) install-headers no_deps=t
+ifneq (,$(filter stage2,$(DEB_BUILD_PROFILES)))
+ $(MAKE) -Cbuild-deb/libihash
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libihash.a
+endif
else
dh_auto_install -Bbuild-deb -- prefix=$(DEB_DESTDIR)
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
libexecdir=$(DEB_DESTDIR)/lib/hurd sysconfdir=$(DEB_DESTDIR)/etc
localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
@@ -97,7 +103,7 @@ endif
mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd
mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd
mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd
-ifeq (,$(filter stage1 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
mkdir -p debian/tmp-udeb/usr/bin
mv debian/tmp-udeb/bin/ps debian/tmp-udeb/bin/ps-hurd
mv debian/tmp-udeb/bin/uptime debian/tmp-udeb/usr/bin/uptime-hurd
@@ -118,7 +124,7 @@ endif
override_dh_install: $(INSTALL_generated)
dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages)))
--sourcedir=debian/tmp-udeb
dh_install --remaining-packages --list-missing --sourcedir=debian/tmp
-ifeq (,$(filter stage1 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
mkdir -p debian/hurd-udeb/usr/share/lintian/overrides
install -p -m644 debian/hurd-udeb.lintian-overrides
debian/hurd-udeb/usr/share/lintian/overrides/hurd-udeb
endif
@@ -131,14 +137,14 @@ override_dh_installchangelogs:
dh_installchangelogs -XChangeLog
override_dh_strip:
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
dh_strip -phurd-libs0.3 -phurd --dbg-package=hurd-dbg
endif
dh_strip --remaining-packages
override_dh_fixperms:
dh_fixperms
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS))
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git