diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -13,6 +13,8 @@ DEVS := generic hde hdf hdg hdh sde sdf sdg sdh scd-all initrd input usb md lp r $(call setarchdevs,powerpc,hdc hdd fd0 fd1 isdn-io m68k-mice) \ $(call setarchdevs,ia64,ida fd0 fd1 ataraid cciss) +MAKEDEV := $(shell if [ -e /dev/MAKEDEV ]; then echo /dev/MAKEDEV; else echo /sbin/MAKEDEV; fi) + all: pkgdetails devices-std.tar.gz devices.tar.gz debootstrap-arch clean: rm -f pkgdetails pkgdetails.o devices-std.tar.gz devices.tar.gz @@ -65,7 +67,7 @@ devices-std.tar.gz: mkdir -p dev chown 0:0 dev chmod 755 dev - (cd dev && /dev/MAKEDEV std ptmx) + (cd dev && $(MAKEDEV) std ptmx) tar cf - dev | gzip -9 >devices-std.tar.gz rm -rf dev @@ -76,7 +78,7 @@ devices.tar.gz: chown 0:0 dev chmod 755 dev - (cd dev && /dev/MAKEDEV $(DEVS)) + (cd dev && $(MAKEDEV) $(DEVS)) ifeq ($(ARCH),powerpc) # Maybe remove amiga/atari mice also? What about usbmouse? diff --git a/debian/changelog b/debian/changelog index 4b59d88..d412033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,12 @@ debootstrap (0.4.0) UNRELEASED; urgency=low - One todo item is done. (I think cross-strap is too, but unsure.) - Reword NMU policy to note that it's team-maintained now. * ACK my prior NMU. Closes: #418600 + * If /dev/MAKEDEV DNE, as on certain s390 machines, use /sbin/MAKEDEV. + Closes: #420908 + Note that /dev/MAKEDEV is still the correct location, and is still tried + first so that building works on all FHS systems, as noted in #190239. - -- Joey Hess <joeyh@debian.org> Sat, 16 Jun 2007 13:05:20 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 16 Jun 2007 13:09:59 -0400 debootstrap (0.3.3.3) unstable; urgency=low |