* No longer include full devices tarball in udeb.

  Requires base-installer 1.85.

r50105

1 files changed, 5 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 82bfd23..69f790a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,22 +5,12 @@ CFLAGS=-Wall -W -O2
 VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog)
 
 ARCH := $(shell dpkg --print-architecture)
-setarchdevs = $(if $(findstring $(ARCH),$(1)),$(2))
-
-DEVS := generic hde hdf hdg hdh sde sdf sdg sdh scd-all initrd input usb md lp rtc video \
-        $(call setarchdevs,i386,isdn-io eda edb sonycd mcd mcdx cdu535 \
-                                optcd sjcd cm206cd gscd lmscd sbpcd \
-                                aztcd bpcd dac960 ida fd0 fd1 ataraid cciss) \
-        $(call setarchdevs,sparc,hdc hdd busmice) \
-        $(call setarchdevs,m68k,fd0 fd1 adc add ade adf hdc hdd) \
-        $(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
+all: pkgdetails devices.tar.gz debootstrap-arch
 clean:
-	rm -f pkgdetails pkgdetails.o devices-std.tar.gz devices.tar.gz
+	rm -f pkgdetails pkgdetails.o devices.tar.gz
 	rm -f debootstrap-arch
 	rm -rf dev
 
@@ -44,13 +34,10 @@ install:
 	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 
-install-allarch: install
-	install -o root -g root -m 0644 devices-std.tar.gz \
-		$(DSDIR)/devices.tar.gz
+	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
 
-install-arch: install
+install-udeb: install
 	install -o root -g root -m 0755 pkgdetails $(DSDIR)/
-	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
 	install -o root -g root -m 0644 debootstrap-arch $(DSDIR)/arch
 
 pkgdetails: pkgdetails.o
@@ -59,43 +46,11 @@ pkgdetails: pkgdetails.o
 debootstrap-arch:
 	echo $(ARCH) >debootstrap-arch
 
-devices-std.tar.gz:
-	rm -rf dev
-	mkdir -p dev
-	chown 0:0 dev
-	chmod 755 dev
-	(cd dev && $(MAKEDEV) std ptmx fd)
-	tar cf - dev | gzip -9 >devices-std.tar.gz
-	rm -rf dev
-
 devices.tar.gz:
 	rm -rf dev
-
 	mkdir -p dev
 	chown 0:0 dev
 	chmod 755 dev
-
-	(cd dev && $(MAKEDEV) $(DEVS))
-
-ifeq ($(ARCH),powerpc)
-#	Maybe remove amiga/atari mice also? What about usbmouse?
-	rm -f dev/adbmouse
-	ln -sf input/mice dev/mouse
-	ln -sf input/js0 dev/js0
-	ln -sf input/js1 dev/js1
-endif
-
-	@if ! find dev -maxdepth 0 -perm 755 -uid 0 -gid 0 | \
-	        grep -q "^dev$$"; \
-	then \
-	   echo "======================================================="; \
-	   echo "ERROR"; echo; \
-	   echo "./dev has bad permissions! should be 755 root.root. Was:"; \
-	   ls -ld ./dev; \
-	   echo "======================================================="; \
-	   false; \
-	fi
-
+	(cd dev && $(MAKEDEV) std ptmx fd)
 	tar cf - dev | gzip -9 >devices.tar.gz
 	rm -rf dev
-