summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2001-08-18 00:51:29 +0000
committerMarcus Brinkmann <marcus@gnu.org>2001-08-18 00:51:29 +0000
commit4c582b3d2422525c041874eeb7eb2d3af683a84b (patch)
tree6a7b8f58965b06c1f21105507eea0e8d082ec689 /debian
parent216c5ce7d69acc70d6cf06badf7c0c99ec6024fd (diff)
2001-08-18 Marcus Brinkmann <marcus@gnu.org>
* debian/changelog: Update for next package upload. * debian/control: Add gnumach-dbg package. * debian/rules: New targets to build gnumach-dbg package. Fix various bugs.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/control14
-rwxr-xr-xdebian/rules79
3 files changed, 90 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 58a32e3..a29d831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+gnumach (1:20010818-1) unstable; urgency=low
+
+ * Update to CVS 20010718.
+ * Patches applied to CVS code: cdromlock.
+ The other patches are in CVS now.
+
+ * Wading through the bug list, there are some old bugs
+ fixed long ago, closes: #37954, #47948, #85302, #45792
+ * debian/rules: Make it build via direct invocation, submitted
+ by Robert Bihlmeyer, closes: #101697.
+
+ * control: New package gnumach-dbg. This kernel is not stripped and includes the
+ kernel-level debugger.
+ * debian/rules: Build this package.
+
+ -- Marcus Brinkmann <brinkmd@debian.de> Sat, 18 Aug 2001 02:15:06 +0200
+
gnumach (1:20010718-1) unstable; urgency=low
* Update to CVS 20010718.
diff --git a/debian/control b/debian/control
index fe51feb..fe3ae35 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gnumach
Section: base
Priority: optional
Maintainer: GNU Hurd Maintainers <bug-hurd@gnu.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.5.6.0
Build-Depends: mig, sharutils
Package: gnumach
@@ -12,6 +12,18 @@ Architecture: hurd-i386
Description: The GNU version of the Mach microkernel
This is the Utah Mach microkernel used by the Hurd.
+Package: gnumach-dbg
+Section: devel
+Priority: extra
+Provides: gnumach
+Architecture: hurd-i386
+Description: The GNU version of the Mach microkernel for debugging
+ This is the Utah Mach microkernel used by the Hurd.
+ .
+ The version in this package is identical to the version found in the
+ gnumach package, except that it is not stripped and has the
+ kernel-level debugger compiled in.
+
Package: gnumach-dev
Section: devel
Priority: optional
diff --git a/debian/rules b/debian/rules
index 2dd37be..a1af635 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,8 @@
# The name of the package (for example, `emacs').
package := gnumach
package-dev := gnumach-dev
-BUILDARCH := $(DEB_BUILD_GNU_TYPE)
-HOSTARCH := $(DEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
# Configuration variables (these should be pretty generic)
CC = cc
@@ -34,7 +34,7 @@ DOCDIR-DEV = $(PREFIX)/doc/$(package-dev)
# generic (gradually).
FILES_TO_CLEAN = debian/files machine
-DIRS_TO_CLEAN = debian/tmp
+DIRS_TO_CLEAN = debian/tmp build build-dbg
STAMPS_TO_CLEAN = stamp-build stamp-configure
install_file = install -o root -g root -m 644
@@ -49,15 +49,10 @@ define checkroot
@test 0 = "`id -u`" || (echo need root priviledges; exit 1)
endef
-configure: stamp-configure
-stamp-configure:
- $(checkdir)
- -mkdir build
- # disabled:
- # ncr5380, ncr53c400, ncr53c406a
- # hpj2577, hpj2573, hp27248b, hp2585, atp
- cd build && ../configure \
- --enable-floppy \
+# disabled:
+# ncr5380, ncr53c400, ncr53c406a
+# hpj2577, hpj2573, hp27248b, hp2585, atp
+drivers := --enable-floppy \
--enable-ide \
\
--enable-advansys \
@@ -129,19 +124,35 @@ stamp-configure:
--enable-skg16 \
--enable-ni52 --enable-ni65 \
--enable-lance \
- --enable-tlan \
- --build=$(BUILDARCH) --host=$(HOSTARCH)
+ --enable-tlan
+
+stamp-configure:
+ $(checkdir)
+ -mkdir build
+ cd build && ../configure $(drivers) \
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
touch stamp-configure
-all build: stamp-build
-stamp-build: configure
+stamp-configure-dbg:
+ $(checkdir)
+ -mkdir build-dbg
+ cd build-dbg && ../configure --enable-kdb $(drivers) \
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+ touch stamp-configure-dbg
+
+all build: stamp-build stamp-build-dbg
+stamp-build: stamp-configure
$(checkdir)
cd build && $(MAKE)
touch stamp-build
+stamp-build-dbg: stamp-configure-dbg
+ $(checkdir)
+ cd build-dbg && $(MAKE)
+ touch stamp-build-dbg
+
clean:
$(checkdir)
- -rm -rf build
-rm -f $(FILES_TO_CLEAN) $(STAMPS_TO_CLEAN)
-rm -rf $(DIRS_TO_CLEAN)
-rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
@@ -176,7 +187,9 @@ binary-indep: build
chown -R root.root debian/tmp
dpkg --build debian/tmp ..
-binary-arch: build
+binary-arch: binary-gnumach binary-gnumach-dbg
+
+binary-gnumach: stamp-build
$(checkdir)
$(checkroot)
-rm -rf debian/tmp
@@ -204,7 +217,35 @@ binary-arch: build
chown -R root.root debian/tmp
dpkg --build debian/tmp ..
+binary-gnumach-dbg: stamp-build-dbg
+ $(checkdir)
+ $(checkroot)
+ -rm -rf debian/tmp
+
+ $(make_directory) debian/tmp/DEBIAN debian/tmp$(DOCDIR)-dbg
+
+ pfx=`cd debian/tmp && pwd` && cd build-dbg && $(MAKE) install-kernel prefix=$$pfx
+ mv debian/tmp/boot/gnumach debian/tmp/boot/gnumach-dbg
+ gzip -9fq debian/tmp/boot/gnumach-dbg
+ -find debian/tmp -type d | xargs chmod g-w
+
+ $(install_file) README debian/tmp$(DOCDIR)-dbg
+ $(install_file) NEWS debian/tmp$(DOCDIR)-dbg
+ $(install_file) ChangeLog debian/tmp$(DOCDIR)-dbg/ChangeLog
+ $(install_file) ChangeLog.0 debian/tmp$(DOCDIR)-dbg
+ $(install_file) ChangeLog.00 debian/tmp$(DOCDIR)-dbg
+ $(install_file) i386/README-Drivers debian/tmp$(DOCDIR)-dbg
+ $(install_file) debian/README.Debian debian/tmp$(DOCDIR)-dbg
+ $(install_file) debian/changelog debian/tmp$(DOCDIR)-dbg/changelog.Debian
+ gzip -9frq debian/tmp$(DOCDIR)-dbg/.
+ $(install_file) debian/copyright debian/tmp$(DOCDIR)-dbg
+ ln -s ChangeLog.gz debian/tmp$(DOCDIR)-dbg/changelog.gz
+
+ dpkg-gencontrol -isp -p$(package)-dbg -Pdebian/tmp
+ chown -R root.root debian/tmp
+ dpkg --build debian/tmp ..
+
binary-indep: build
# We have nothing to do here.
-.PHONY: build clean binary-indep binary-arch binary configure
+.PHONY: build clean binary-indep binary-arch binary-gnumach binary-gnumach-dbg binary configure