From e9736692afb9ec6204160b950331fdddc6f35053 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 12:16:38 +0000 Subject: New upstream snapshot. --- debian/changelog | 8 ++- debian/hurd.install | 6 ++ debian/patches/external.patch | 111 +++++++++++++++++++++++++++++++++ debian/patches/libexec.patch | 2 +- debian/patches/libpthread_procfs.patch | 83 ------------------------ debian/patches/series | 2 +- debian/rules | 6 ++ 7 files changed, 131 insertions(+), 87 deletions(-) create mode 100644 debian/patches/external.patch delete mode 100644 debian/patches/libpthread_procfs.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 60bb729c..d21e14ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,18 @@ -hurd (20111206-2) UNRELEASED; urgency=low +hurd (20120219-1) UNRELEASED; urgency=low + [ Samuel Thibault ] + * New upstream snapshot. + - And merge DDE work from Zheng Da. * patches/ext2fs_large_stores.patch: Fix memory leak, thanks Sergio Lopez! * debian/hurd-console.default: Enable the console by default. + * debian/patches/libpthread_procfs.patch: Rename to external.patch. [ Pino Toscano ] * hurd.install, hurd.postinst, rules: Rename halt/reboot to halt-hurd/reboot-hurd, and register them as slaves of the runsystem alternative. - -- Samuel Thibault Sat, 21 Jan 2012 23:59:41 +0100 + -- Samuel Thibault Sun, 19 Feb 2012 06:17:49 +0000 hurd (20111206-1) unstable; urgency=low diff --git a/debian/hurd.install b/debian/hurd.install index 05254303..922c8761 100644 --- a/debian/hurd.install +++ b/debian/hurd.install @@ -54,6 +54,7 @@ debian/tmp/bin/rpctrace debian/tmp/bin/mount debian/tmp/bin/gcore debian/tmp/bin/fakeauth +debian/tmp/bin/devnode debian/tmp/usr/bin/fakeroot-hurd debian/tmp/bin/forks debian/tmp/bin/timertest @@ -67,3 +68,8 @@ debian/tmp/etc/login/README debian/tmp/etc/ttys debian/tmp/dev/MAKEDEV debian/tmp/share/msgids/hurd.msgids usr/share/msgids +dde_e100/dde_e100 /hurd/dde +dde_e1000/dde_e1000 /hurd/dde +dde_rtl8139/dde_rtl8139 /hurd/dde +dde_pcnet32/dde_pcnet32 /hurd/dde +dde_ne2k_pci/dde_ne2k_pci /hurd/dde diff --git a/debian/patches/external.patch b/debian/patches/external.patch new file mode 100644 index 00000000..5f38d536 --- /dev/null +++ b/debian/patches/external.patch @@ -0,0 +1,111 @@ +Include libpthread and procfs in the build + +Index: hurd-debian/Makefile +=================================================================== +--- hurd-debian.orig/Makefile 2010-09-27 19:42:53.000000000 +0000 ++++ hurd-debian/Makefile 2010-09-27 19:45:57.000000000 +0000 +@@ -31,7 +31,8 @@ + # Hurd libraries + lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \ + libpager libfshelp libdiskfs libtrivfs libps \ +- libnetfs libpipe libstore libhurdbugaddr libftpconn libcons ++ libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \ ++ libpthread libmachdev libddekit libhurd-slab + + # Hurd programs + prog-subdirs = auth proc exec init term \ +@@ -40,7 +41,7 @@ + login daemons boot console \ + hostmux usermux ftpfs trans \ + console-client utils sutils ufs-fsck ufs-utils \ +- benchmarks fstests ++ benchmarks fstests procfs random devnode + + ifeq ($(HAVE_SUN_RPC),yes) + prog-subdirs += nfs nfsd +--- hurd-debian.orig/Makeconf ++++ hurd-debian/Makeconf +@@ -548,7 +548,7 @@ vpath %.defs $(top_srcdir)/hurd + # These we want to find in the libc include directory... + mach_defs_names = bootstrap exc mach mach4 \ + mach_host mach_port mach_timer_reply memory_object \ +- memory_object_default notify ++ memory_object_default notify experimental + device_defs_names = dev_forward device device_reply device_request + + mach_defs = $(addsuffix .defs,$(mach_defs_names)) +diff --git a/configure.in b/configure.in +index 05b959b..68ec159 100644 +--- a/configure.in ++++ b/configure.in +@@ -227,6 +227,12 @@ AC_SUBST(boot_store_types)dnl + AC_MSG_CHECKING(boot store types) + AC_MSG_RESULT($boot_store_types) + ++AC_CHECK_LIB(pciaccess, pci_system_init, LIBPCIACCESS=-lpciaccess, LIBPCIACCESS=no) ++AC_SUBST(LIBPCIACCESS) ++if test "$LIBPCIACCESS" = "no"; then ++ AC_MSG_ERROR([libpciaccess must be install in order to use libddekit]) ++fi ++ + # Check for ncursesw, which is needed for the console-curses client. + hurd_LIB_NCURSESW + +Index: hurd-debian/procfs/Makefile +=================================================================== +--- hurd-debian.orig/procfs/Makefile 2010-09-27 19:50:41.000000000 +0000 ++++ hurd-debian/procfs/Makefile 2010-09-27 19:50:46.000000000 +0000 +@@ -1,26 +1,30 @@ +-TARGET = procfs +-OBJS = procfs.o netfs.o procfs_dir.o \ +- process.o proclist.o rootdir.o dircat.o main.o +-LIBS = -lnetfs -lps ++# Makefile - for procfs ++# ++# Copyright (C) 2008 Free Software Foundation, Inc. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2, or (at ++# your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++dir := procfs ++makemode := server ++ ++target = procfs + +-CC = gcc +-CFLAGS = -Wall -g +-CPPFLAGS = +-LDFLAGS = ++SRCS = procfs.c netfs.c procfs_dir.c process.c proclist.c rootdir.c dircat.c main.c ++LCLHDRS = dircat.h main.h process.h procfs.h procfs_dir.h proclist.h rootdir.h + +-ifdef PROFILE +-CFLAGS= -g -pg +-CPPFLAGS= -DPROFILE +-LDFLAGS= -static +-LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lthreads -lihash -lshouldbeinlibc +-endif ++OBJS = $(SRCS:.c=.o) ++HURDLIBS = netfs fshelp iohelp ps ports threads ihash shouldbeinlibc + +-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +- +-all: $(TARGET) +- +-$(TARGET): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) +- +-clean: +- $(RM) $(TARGET) $(OBJS) ++include ../Makeconf diff --git a/debian/patches/libexec.patch b/debian/patches/libexec.patch index d46b7692..f73ea587 100644 --- a/debian/patches/libexec.patch +++ b/debian/patches/libexec.patch @@ -6,7 +6,7 @@ index 6a548d5..d10bfcc 100644 # name program type status comments --console "/libexec/getty 9600" mach-color on secure trusted console +-console "/libexec/getty 9600" mach-gnu-color on secure trusted console -tty1 "/libexec/getty 38400" hurd on secure trusted console -tty2 "/libexec/getty 38400" hurd on secure trusted console -tty3 "/libexec/getty 38400" hurd on secure trusted console diff --git a/debian/patches/libpthread_procfs.patch b/debian/patches/libpthread_procfs.patch deleted file mode 100644 index 8d3ddbe0..00000000 --- a/debian/patches/libpthread_procfs.patch +++ /dev/null @@ -1,83 +0,0 @@ -Include libpthread and procfs in the build - -Index: hurd-debian/Makefile -=================================================================== ---- hurd-debian.orig/Makefile 2010-09-27 19:42:53.000000000 +0000 -+++ hurd-debian/Makefile 2010-09-27 19:45:57.000000000 +0000 -@@ -31,7 +31,8 @@ - # Hurd libraries - lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \ - libpager libfshelp libdiskfs libtrivfs libps \ -- libnetfs libpipe libstore libhurdbugaddr libftpconn libcons -+ libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \ -+ libpthread - - # Hurd programs - prog-subdirs = auth proc exec init term \ -@@ -40,7 +41,7 @@ - login daemons boot console \ - hostmux usermux ftpfs trans \ - console-client utils sutils ufs-fsck ufs-utils \ -- benchmarks fstests -+ benchmarks fstests procfs random - - ifeq ($(HAVE_SUN_RPC),yes) - prog-subdirs += nfs nfsd -Index: hurd-debian/procfs/Makefile -=================================================================== ---- hurd-debian.orig/procfs/Makefile 2010-09-27 19:50:41.000000000 +0000 -+++ hurd-debian/procfs/Makefile 2010-09-27 19:50:46.000000000 +0000 -@@ -1,26 +1,30 @@ --TARGET = procfs --OBJS = procfs.o netfs.o procfs_dir.o \ -- process.o proclist.o rootdir.o dircat.o main.o --LIBS = -lnetfs -lps -+# Makefile - for procfs -+# -+# Copyright (C) 2008 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2, or (at -+# your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ -+dir := procfs -+makemode := server -+ -+target = procfs - --CC = gcc --CFLAGS = -Wall -g --CPPFLAGS = --LDFLAGS = -+SRCS = procfs.c netfs.c procfs_dir.c process.c proclist.c rootdir.c dircat.c main.c -+LCLHDRS = dircat.h main.h process.h procfs.h procfs_dir.h proclist.h rootdir.h - --ifdef PROFILE --CFLAGS= -g -pg --CPPFLAGS= -DPROFILE --LDFLAGS= -static --LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lthreads -lihash -lshouldbeinlibc --endif -+OBJS = $(SRCS:.c=.o) -+HURDLIBS = netfs fshelp iohelp ps ports threads ihash shouldbeinlibc - --CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -- --all: $(TARGET) -- --$(TARGET): $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -- --clean: -- $(RM) $(TARGET) $(OBJS) -+include ../Makeconf diff --git a/debian/patches/series b/debian/patches/series index 1474ac43..17312c59 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,7 +18,7 @@ libports_stability.patch libpthread_fix.patch extern_inline_fix.patch proxy-defpager.diff -libpthread_procfs.patch +external.patch makedev_keep_options.patch makedev_parted_store.patch console_ignore_bdf_err.patch diff --git a/debian/rules b/debian/rules index 094f3a56..94d610d0 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,12 @@ DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb" build/hurd:: cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi + $(MAKE) -C libdde_linux26 + $(MAKE) -C dde_e100 + $(MAKE) -C dde_e1000 + $(MAKE) -C dde_pcnet32 + $(MAKE) -C dde_rtl8139 + $(MAKE) -C dde_ne2k_pci install/hurd:: # runsystem is managed by update-alternatives -- cgit v1.2.3