[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Add stage1 build profile for cross-bootstrapping hurd.
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 01/01: Add stage1 build profile for cross-bootstrapping hurd. |
|
Date: |
Tue, 18 Aug 2015 17:17:51 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 508f43bafb7e17ab96c2584148a4e345eb58144f
Author: Samuel Thibault <address@hidden>
Date: Tue Aug 18 19:16:57 2015 +0200
Add stage1 build profile for cross-bootstrapping hurd.
---
debian/changelog | 1 +
debian/control | 20 ++++++++++++--------
debian/hurd-dev.install.in | 21 +++++++++++----------
debian/patches/series | 1 +
debian/rules | 33 +++++++++++++++++++++++++++++----
5 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1477bda..1bd7394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +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.
-- Samuel Thibault <address@hidden> Tue, 18 Aug 2015 10:50:47 +0000
diff --git a/debian/control b/debian/control
index f2b3595..82f6d16 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~), gnumach-dev (>= 1.4+git20141109~),
- libc0.3-dev (>= 2.17-94~), texinfo, libncursesw5-dev,
- debhelper (>= 7.0.50~), autoconf, dh-autoreconf,
- libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config,
- xkb-data, gawk, flex, bison, autotools-dev, libdaemon-dev, libpcap0.8-dev,
- zlib1g-dev, libbz2-dev, uuid-dev, libblkid-dev
+Build-Depends: mig (>= 1.4-3~) <!stage1>, gnumach-dev (>= 1.4+git20141109~)
<!stage1>,
+ libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1>,
+ 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>
Uploaders: Michael Banck <address@hidden>,
Samuel Thibault <address@hidden>
Homepage: http://www.gnu.org/software/hurd/hurd.html
@@ -21,6 +21,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: netdde (<< 0.0.20121127-3+)
Architecture: hurd-any
+Build-Profiles: <!stage1>
Multi-Arch: same
Description: GNU Hurd (libraries)
This package contains the libraries used by GNU Hurd.
@@ -37,6 +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>
Description: GNU Hurd
This is the GNU Hurd package. It contains essential system software and
libraries.
@@ -56,6 +58,7 @@ Package: hurd-dbg
Priority: extra
Section: debug
Architecture: hurd-any
+Build-Profiles: <!stage1>
Depends: ${misc:Depends}, hurd (= ${binary:Version})
Description: GNU Hurd (debugging files)
This package includes the unstripped binaries and libraries.
@@ -64,6 +67,7 @@ Package: hurd-doc
Priority: optional
Section: doc
Architecture: all
+Build-Profiles: <!stage1>
Depends: ${misc:Depends}
Suggests: www-browser
Description: GNU Hurd manual
@@ -74,7 +78,7 @@ Section: debian-installer
Package-Type: udeb
Priority: optional
Architecture: hurd-any
-Build-Profiles: <!noudeb>
+Build-Profiles: <!noudeb !stage1>
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: GNU Hurd (libraries) - udeb
This package contains the libraries used by GNU Hurd udeb.
@@ -84,7 +88,7 @@ Package-Type: udeb
Priority: optional
Section: debian-installer
Architecture: hurd-any
-Build-Profiles: <!noudeb>
+Build-Profiles: <!noudeb !stage1>
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
old mode 100644
new mode 100755
index d5514a3..cfcb7e5
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,11 +1,12 @@
-../../libdde-linux26/Makeconf* usr/share/libdde_linux26
-../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
-../../libdde-linux26/mk usr/share/libdde_linux26
-../local/cdrom.h usr/include/sys
-../local/soundcard.h usr/include/sys
-bin/fstests
-bin/timertest
+#! /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
include/* usr/include
-lib/@DEB_HOST_MULTIARCH@/*.a
-lib/@DEB_HOST_MULTIARCH@/*.so
-usr/share/libdde_linux26/build usr/share/libdde_linux26
+<!stage1> lib/@DEB_HOST_MULTIARCH@/*.a
+<!stage1> lib/@DEB_HOST_MULTIARCH@/*.so
+<!stage1> usr/share/libdde_linux26/build usr/share/libdde_linux26
diff --git a/debian/patches/series b/debian/patches/series
index 3836288..90d133d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ newRPC.patch
dl_origin.patch
fix-payload-pflocal.patch
fakeroot-access.patch
+bootstrap.patch
diff --git a/debian/rules b/debian/rules
index fec827f..efdc9c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,19 @@
DEB_DESTDIR = $(CURDIR)/debian/tmp
DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
+else
+CONFIGURE_ARGS = \
+ --disable-ncursesw \
+ --without-libbz2 \
+ --without-libz \
+ --without-parted \
+ --build=i586-gnu
+# Skip the clnt_create check because it expects
+# a working glibc causing a circular dependency.
+export ac_cv_search_clnt_create=no
+endif
CONFIGURE_ARGS_deb =
CONFIGURE_ARGS_udeb = --without-libdaemon --without-libbz2
SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
@@ -37,21 +49,25 @@ 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 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 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
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
override_dh_auto_clean:
dh_auto_clean -Bbuild-deb
-ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_clean -Bbuild-udeb
endif
$(MAKE) -C libdde-linux26 cleanall
@@ -61,6 +77,9 @@ endif
rm -f $(INSTALL_generated)
override_dh_auto_install:
+ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+ $(MAKE) -Cbuild-deb prefix=$(DEB_DESTDIR) install-headers no_deps=t
+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)))
dh_auto_install -Bbuild-udeb -- prefix=$(DEB_DESTDIR_UDEB)
libdir=$(DEB_DESTDIR_UDEB)/lib libexecdir=$(DEB_DESTDIR)/lib/hurd
sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var
XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb
@@ -78,7 +97,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 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 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
@@ -94,11 +113,12 @@ endif
# remove PIC static libraries
rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
rm -f debian/tmp-udeb/lib/*_pic.a
+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 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 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
@@ -111,12 +131,16 @@ override_dh_installchangelogs:
dh_installchangelogs -XChangeLog
override_dh_strip:
+ifeq (,$(filter stage1,$(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)))
chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS))
+endif
override_dh_makeshlibs:
dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb
@@ -131,4 +155,5 @@ override_dh_clean:
debian/%.install: debian/%.install.in
cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@
+ [ ! -x $< ] || chmod +x $@
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git