diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 59 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 43 | ||||
| -rw-r--r-- | debian/hurd-dev.install.in | 21 | ||||
| -rw-r--r-- | debian/hurd-udeb.install.in | 7 | ||||
| -rw-r--r-- | debian/hurd.install.in | 2 | ||||
| -rw-r--r-- | debian/hurd.postinst | 2 | ||||
| -rwxr-xr-x | debian/rules | 78 |
8 files changed, 187 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index 361a7820..720a7666 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,62 @@ +hurd (1:0.6.git20150704-4) UNRELEASED; urgency=medium + + * Upgrade to compat 9. + * Add a noudeb build profile. + * Add stage1 and stage2 build profiles for cross-bootstrapping hurd. + * Move console modules to multiarch path. + * Bump fakeroot-hurd priority so it becomes the default. + * Fix build against glibc 2.21. + + -- Samuel Thibault <sthibault@debian.org> Tue, 18 Aug 2015 10:50:47 +0000 + +hurd (1:0.6.git20150704-3) unstable; urgency=medium + + [ Justus Winter ] + * Fix payload for pflocal. + + [ Samuel Thibault ] + * Fix fakeroot-hurd for Xvfb. + + -- Samuel Thibault <sthibault@debian.org> Fri, 14 Aug 2015 12:16:19 +0000 + +hurd (1:0.6.git20150704-2) unstable; urgency=medium + + [ Samuel Thibault ] + * Disable payload for pflocal address ports for now, as it breaks X11 + authentication. + + [ Justus Winter ] + * Include the new rpcscan utility. + + -- Samuel Thibault <sthibault@debian.org> Thu, 13 Aug 2015 22:05:20 +0000 + +hurd (1:0.6.git20150704-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Samuel Thibault <sthibault@debian.org> Sat, 04 Jul 2015 21:35:32 +0000 + +hurd (1:0.6.git20150523-1) unstable; urgency=medium + + * New upstream release. Closes: #785134. + + -- Samuel Thibault <sthibault@debian.org> Fri, 22 May 2015 20:58:45 +0000 + +hurd (1:0.6-4) unstable; urgency=medium + + * patches/dl_origin.patch: Fix off-by-one. + + -- Samuel Thibault <sthibault@debian.org> Fri, 01 May 2015 20:23:15 +0000 + +hurd (1:0.6-3) unstable; urgency=medium + + * patches/dl_origin.patch: New patch to enable $ORIGIN expansion support in + rpath for absolute paths. + * patches/git-R-libdiskfs-protected-payload.patch: Remove to re-enable using + protected payload in libdiskfs, now that the support is fixed in gnumach. + + -- Samuel Thibault <sthibault@debian.org> Fri, 01 May 2015 10:08:14 +0000 + hurd (1:0.6-2) unstable; urgency=medium * patches/git-R-libdiskfs-protected-payload.patch: Revert using protected diff --git a/debian/compat b/debian/compat index 7f8f011e..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index b4e5f4d6..e4ecd625 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: admin Priority: required Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org> 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 !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 !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 <mbanck@debian.org>, Samuel Thibault <sthibault@debian.org> 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 !stage2> Multi-Arch: same Description: GNU Hurd (libraries) This package contains the libraries used by GNU Hurd. @@ -29,7 +30,7 @@ Package: hurd Essential: yes Pre-Depends: hurd-libs0.3 Depends: ${misc:Depends}, hurd-libs0.3 (= ${binary:Version}), sysv-rc, netdde (>= 0.0.20120518~), ${shlibs:Depends}, xkb-data -Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.18-0experimental1), netdde (<< 0.0.20121127-2) +Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.19-15~), netdde (<< 0.0.20121127-2) Built-Using: ${built-using} Suggests: hurd-doc Recommends: bf-utf-source @@ -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 !stage2> Description: GNU Hurd This is the GNU Hurd package. It contains essential system software and libraries. @@ -46,7 +48,7 @@ Priority: standard Section: libdevel Architecture: hurd-any Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, - libc0.3-dev (>= 2.13-31~), hurd (= ${binary:Version}) + libc0.3-dev (>= 2.13-31~) <!stage1>, hurd (= ${binary:Version}) <!stage1 !stage2> Replaces: hurd (<< 20130226-2~) Breaks: hurd (<< 20130226-2~) Description: GNU Hurd (development files) @@ -56,6 +58,7 @@ Package: hurd-dbg Priority: extra Section: debug Architecture: hurd-any +Build-Profiles: <!stage1 !stage2> Depends: ${misc:Depends}, hurd (= ${binary:Version}) Description: GNU Hurd (debugging files) This package includes the unstripped binaries and libraries. @@ -64,7 +67,31 @@ Package: hurd-doc Priority: optional Section: doc Architecture: all +Build-Profiles: <!stage1 !stage2> Depends: ${misc:Depends} Suggests: www-browser Description: GNU Hurd manual This package includes the manual in info and HTML format. + +Package: hurd-libs0.3-udeb +Section: debian-installer +Package-Type: udeb +Priority: optional +Architecture: hurd-any +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. + +Package: hurd-udeb +Package-Type: udeb +Priority: optional +Section: debian-installer +Architecture: hurd-any +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 +Description: GNU Hurd - udeb + This is the GNU Hurd udeb package. It contains essential system software and + libraries. diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in index d5514a32..08001be0 100644 --- 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 !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 -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 !stage2> lib/@DEB_HOST_MULTIARCH@/*.so +<!stage1 !stage2> usr/share/libdde_linux26/build usr/share/libdde_linux26 diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in index 25c268c8..a2049dc0 100644 --- a/debian/hurd-udeb.install.in +++ b/debian/hurd-udeb.install.in @@ -42,6 +42,7 @@ hurd/firmlink hurd/fwd hurd/ifsock hurd/init +hurd/startup hurd/iso9660fs hurd/mach-defpager hurd/magic @@ -59,9 +60,9 @@ hurd/streamio hurd/symlink hurd/term hurd/tmpfs -lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console -lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console -lib/hurd/console/vga.so.* usr/lib/hurd/console +lib/hurd/console/pc_kbd.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console +lib/hurd/console/pc_mouse.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console +lib/hurd/console/vga.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console lib/hurd/console-run sbin sbin/MAKEDEV sbin/e2os diff --git a/debian/hurd.install.in b/debian/hurd.install.in index 740ff432..ac918925 100644 --- a/debian/hurd.install.in +++ b/debian/hurd.install.in @@ -46,7 +46,7 @@ etc/login/.profile etc/login/README etc/ttys hurd/* -lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console +lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console lib/hurd/console-run sbin lib/hurd/getty sbin lib/hurd/rc etc/hurd diff --git a/debian/hurd.postinst b/debian/hurd.postinst index c947914b..081c039b 100644 --- a/debian/hurd.postinst +++ b/debian/hurd.postinst @@ -13,7 +13,7 @@ update-alternatives --quiet \ --slave /sbin/reboot reboot /sbin/reboot-hurd update-alternatives \ - --install /usr/bin/fakeroot fakeroot /usr/bin/fakeroot-hurd 30 + --install /usr/bin/fakeroot fakeroot /usr/bin/fakeroot-hurd 60 update-alternatives \ --install /bin/ps ps /bin/ps-hurd 60 diff --git a/debian/rules b/debian/rules index a58d2df8..9d88d5a6 100755 --- a/debian/rules +++ b/debian/rules @@ -18,9 +18,30 @@ # 02111-1307 USA. DEB_DESTDIR = $(CURDIR)/debian/tmp +DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb +ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES))) CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs' +else +CONFIGURE_ARGS = \ + --disable-ncursesw \ + --without-libbz2 \ + --without-libz \ + --without-parted +# Skip some checks because they expect +# a working glibc causing a circular dependency. +# TODO: rather disable the corresponding features in configure.ac +export ac_cv_search_clnt_create=no +export ac_cv_lib_pciaccess_pci_system_init=no +export ac_cv_func_file_exec_file_name=no +export ac_cv_func_exec_exec_file_name=no +export ac_cv_func__hurd_exec_file_name=no +export LEX=: +export YACC=: +export MIG=: +endif CONFIGURE_ARGS_deb = +CONFIGURE_ARGS_udeb = --without-libdaemon --without-libbz2 SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -28,19 +49,38 @@ DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) INSTALL_in := $(wildcard debian/*.install.in) INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in)) +BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libc0.3-dev libparted-dev zlib1g-dev libbz2-dev uuid-dev libblkid-dev) + %: dh $@ -Bbuild-deb --with autotools_dev,autoreconf override_dh_auto_configure: dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure) +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: +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 dh_auto_build -Bbuild-deb cd build-deb/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi - $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb + $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS= +endif +endif override_dh_auto_clean: dh_auto_clean -Bbuild-deb +ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES))) + dh_auto_clean -Bbuild-udeb +endif $(MAKE) -C libdde-linux26 cleanall rm -f $$(find libdde-linux26 -name \*.d) rm -fr libdde-linux26/build @@ -48,7 +88,16 @@ override_dh_auto_clean: rm -f $(INSTALL_generated) override_dh_auto_install: - dh_auto_install -Bbuild-deb --destdir= -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb +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))) + dh_auto_install -Bbuild-udeb -- prefix=$(DEB_DESTDIR_UDEB) libdir=$(DEB_DESTDIR_UDEB)/lib libexecdir=$(DEB_DESTDIR_UDEB)/lib/hurd sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb +endif $(MAKE) -C libdde-linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install # runsystem is managed by update-alternatives @@ -62,6 +111,13 @@ override_dh_auto_install: 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 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 + mv debian/tmp-udeb/bin/vmstat debian/tmp-udeb/usr/bin/vmstat-hurd + mv debian/tmp-udeb/bin/w debian/tmp-udeb/usr/bin/w-hurd +endif # move away halt and reboot to not conflict with sysvinit # (they will be handled as alternatives) @@ -70,9 +126,16 @@ override_dh_auto_install: # 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 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 override_dh_installinit: dh_installinit -phurd --name=hurd-console @@ -82,20 +145,29 @@ override_dh_installchangelogs: dh_installchangelogs -XChangeLog override_dh_strip: +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 stage2,$(DEB_BUILD_PROFILES))) chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS)) +endif override_dh_makeshlibs: - dh_makeshlibs -phurd-libs0.3 + dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb dh_makeshlibs --remaining-packages -Xusr/lib/hurd/ +override_dh_gencontrol: + dh_gencontrol -- -V"built-using=$(BUILT_USING)" + override_dh_clean: dh_clean + rm -rf debian/tmp-udeb debian/%.install: debian/%.install.in cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@ + [ ! -x $< ] || chmod +x $@ |