From d8a73fe012567565113419dc0c4678df5abe5bc5 Mon Sep 17 00:00:00 2001
From: Florian Lohoff <flo@rfc822.org>
Date: Sat, 4 Oct 2008 12:45:43 +0000
Subject: don't build tip22 specially

so we can make debian/rules more straightforward
---
 debian/arcboot.dirs |  4 ++++
 debian/dirs         |  4 ----
 debian/rules        | 34 +++++++++++++++++++++++++++++-----
 debian/tip22.dirs   |  2 ++
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 debian/arcboot.dirs
 delete mode 100644 debian/dirs
 create mode 100644 debian/tip22.dirs

(limited to 'debian')

diff --git a/debian/arcboot.dirs b/debian/arcboot.dirs
new file mode 100644
index 0000000..947a565
--- /dev/null
+++ b/debian/arcboot.dirs
@@ -0,0 +1,4 @@
+usr/lib/arcboot
+usr/sbin
+etc/
+usr/share/lintian/overrides
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 947a565..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/arcboot
-usr/sbin
-etc/
-usr/share/lintian/overrides
diff --git a/debian/rules b/debian/rules
index e003fda..ed88571 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,10 +34,24 @@ build-stamp:
 	$(MAKE) build-subarch-indep
 	$(MAKE) clean-subarch-dep
 	$(MAKE) SUBARCH=IP32 build-subarch-dep
+
 	cp ext2load/ext2load arcboot.ip32
+	cp tip22/ld.kernel.script ld.kernel.script.IP32
+	cp tip22/ld.ramdisk.script ld.ramdisk.script.IP32
+	cp tip22/ld.script ld.script.IP32
+	cp tip22/ld.script ld.script.IP32
+	cp tip22/tftpload.o tftpload.IP32.o
+
 	$(MAKE) clean-subarch-dep
 	$(MAKE) SUBARCH=IP22 build-subarch-dep
+
 	cp ext2load/ext2load arcboot.ip22
+	cp tip22/ld.kernel.script ld.kernel.script.IP22
+	cp tip22/ld.ramdisk.script ld.ramdisk.script.IP22
+	cp tip22/ld.script ld.script.IP22
+	cp tip22/ld.script ld.script.IP22
+	cp tip22/tftpload.o tftpload.IP22.o
+
 	touch build-stamp
 
 clean:
@@ -46,7 +60,9 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
-	rm -f arcboot.ip22 arcboot.ip32
+	rm -f arcboot.ip22 arcboot.ip32 
+	rm -f ld.script.IP22 ld.ramdisk.script.IP22 ld.kernel.script.IP22 tftpload.IP22.o
+	rm -f ld.script.IP32 ld.ramdisk.script.IP32 ld.kernel.script.IP32 tftpload.IP32.o
 
 	dh_clean
 
@@ -57,13 +73,21 @@ install: build
 	dh_installdirs
 
 	# install arcboot into debian/arcboot
-	install -m 644 arcboot.ip22 ${PREFIX_ARCB}/${LIB_ARCB}/arcboot.ip22
 	install -m 644 arcboot.ip32 ${PREFIX_ARCB}/${LIB_ARCB}/arcboot.ip32
+	install -m 644 arcboot.ip22 ${PREFIX_ARCB}/${LIB_ARCB}/arcboot.ip22
 	install -m 755 scripts/arcboot ${PREFIX_ARCB}/${BIN_ARCB}/arcboot
 
-	# install tip22 into debian/tip22
-	$(MAKE) PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C arclib install
-	$(MAKE) PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C tip22 install
+	install -m 644 tftpload.IP32.o ${PREFIX_TIP22}/${LIB_TIP22}/tftpload.IP32.o
+	install -m 644 ld.kernel.script.IP32 ${PREFIX_TIP22}/${LIB_TIP22}/ld.kernel.script.IP32
+	install -m 644 ld.ramdisk.script.IP32 ${PREFIX_TIP22}/${LIB_TIP22}/ld.ramdisk.script.IP32
+	install -m 644 ld.script.IP32 ${PREFIX_TIP22}/${LIB_TIP22}/ld.script.IP32
+	install -m 755 tip22/tip32 ${PREFIX_TIP22}/${BIN_TIP22}/tip32
+
+	install -m 644 tftpload.IP22.o ${PREFIX_TIP22}/${LIB_TIP22}/tftpload.IP22.o
+	install -m 644 ld.kernel.script.IP22 ${PREFIX_TIP22}/${LIB_TIP22}/ld.kernel.script.IP22
+	install -m 644 ld.ramdisk.script.IP22 ${PREFIX_TIP22}/${LIB_TIP22}/ld.ramdisk.script.IP22
+	install -m 644 ld.script.IP22 ${PREFIX_TIP22}/${LIB_TIP22}/ld.script.IP22
+	install -m 755 tip22/tip22 ${PREFIX_TIP22}/${BIN_TIP22}/tip22
 
         # Install lintian overrides
 	cp debian/arcboot.lintian-overrides $(CURDIR)/debian/arcboot/usr/share/lintian/overrides/arcboot
diff --git a/debian/tip22.dirs b/debian/tip22.dirs
new file mode 100644
index 0000000..1cc5fc5
--- /dev/null
+++ b/debian/tip22.dirs
@@ -0,0 +1,2 @@
+usr/lib/tip22
+usr/sbin
-- 
cgit v1.2.3