[Debootloaders-devel] r190 - in trunk/silo/debian: . patches

Sun Aug 12 21:47:31 UTC 2007

Author: jurij
Date: 2007-08-12 21:47:31 +0000 (Sun, 12 Aug 2007)
New Revision: 190

Added:
   trunk/silo/debian/patches/series
   trunk/silo/debian/postinst
Removed:
   trunk/silo/debian/README.build
   trunk/silo/debian/TODO
   trunk/silo/debian/packages.d/
   trunk/silo/debian/scripts/
Modified:
   trunk/silo/debian/changelog
   trunk/silo/debian/control
   trunk/silo/debian/rules
Log:
Get rid of the legacy build system:
 - switch patch management to quilt, add a build-dep on it.
 - build-tree is now created from the source in package directory, so 
   that we can switch it to non-native format.
 - explicitly add the postinst script, instead of generating it during 
   build.
 - remove unneeded pieces.


Deleted: trunk/silo/debian/README.build
===================================================================

--- trunk/silo/debian/README.build	2007-08-12 15:19:26 UTC (rev 189)
+++ trunk/silo/debian/README.build	2007-08-12 21:47:31 UTC (rev 190)
@@ -1,20 +0,0 @@
-This package uses a form of source build based on DBS. To setup the
-source, run "debian/rules setup". This will extract the pristine source in
-build-dir/, apply patches from debian/patches/ and split the package
-scripts from debian/packages.d/ into their component files.
-
-A few cavaets. Modifying the source in build-tree/ or the package files in
-debian/, will not be preserved after the "clean" target is run. Actual
-files for packages are in debian/packages.d/ and will be regerated after
-being modified.
-
-To create patches for the source, you can remember several steps. There
-are two targes for handling source. The "unpack" target, will simply
-unpack the tarball(s) into build-tree/ and "patch" will apply all patches
-from debian/patches/. If you make any changes you can generate a new patch
-using the "make_patch" target. This will move your current sources under
-build-tree/, unpack the source+patches again, and then generate a diff
-between the two. Note, you should run the "clean" target in the
-build-tree/ source before doing this, to get a clean patch.
-
-Ben

Deleted: trunk/silo/debian/TODO
===================================================================
--- trunk/silo/debian/TODO	2007-08-12 15:19:26 UTC (rev 189)
+++ trunk/silo/debian/TODO	2007-08-12 21:47:31 UTC (rev 190)
@@ -1,4 +0,0 @@
-- Make use of silocheck so we can ensure older PROM's will be able to boot
-  (1 GB limit thing).
-- Write a visilo program/script that edits the file, then runs
-  siloconfcheck before making it active.

Modified: trunk/silo/debian/changelog
===================================================================
--- trunk/silo/debian/changelog	2007-08-12 15:19:26 UTC (rev 189)
+++ trunk/silo/debian/changelog	2007-08-12 21:47:31 UTC (rev 190)
@@ -1,3 +1,10 @@
+silo (1.4.13-2) UNRELEASED; urgency=low
+
+  * Get rid of the legacy build system, switch to quilt for patch
+    management.
+
+ -- Jurij Smakov <jurij at debian.org>  Sun, 12 Aug 2007 22:18:05 +0100
+
 silo (1.4.13-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/silo/debian/control
===================================================================
--- trunk/silo/debian/control	2007-08-12 15:19:26 UTC (rev 189)
+++ trunk/silo/debian/control	2007-08-12 21:47:31 UTC (rev 190)
@@ -3,7 +3,7 @@
 Priority: important
 Maintainer: Ben Collins <bcollins at debian.org>
 Uploaders: Jurij Smakov <jurij at debian.org>
-Build-Depends: e2fslibs-dev (>= 1.28-1), debhelper (>= 5.0), gcc-4.1, bzip2, sparc-utils, perl, linux-kernel-headers (>= 2.6.18)
+Build-Depends: e2fslibs-dev (>= 1.28-1), debhelper (>= 5.0), gcc-4.1, bzip2, sparc-utils, perl, linux-kernel-headers (>= 2.6.18), quilt
 Standards-Version: 3.2.1.0
 
 Package: silo

Added: trunk/silo/debian/patches/series
===================================================================
--- trunk/silo/debian/patches/series	                        (rev 0)
+++ trunk/silo/debian/patches/series	2007-08-12 21:47:31 UTC (rev 190)
@@ -0,0 +1 @@
+10-silo_new_ufs_superblock.patch

Added: trunk/silo/debian/postinst
===================================================================
--- trunk/silo/debian/postinst	                        (rev 0)
+++ trunk/silo/debian/postinst	2007-08-12 21:47:31 UTC (rev 190)
@@ -0,0 +1,4 @@
+#!/bin/sh
+/usr/sbin/siloconfig
+
+#DEBHELPER#

Modified: trunk/silo/debian/rules
===================================================================
--- trunk/silo/debian/rules	2007-08-12 15:19:26 UTC (rev 189)
+++ trunk/silo/debian/rules	2007-08-12 21:47:31 UTC (rev 190)
@@ -1,36 +1,40 @@
 #!/usr/bin/make -f
 
-# the dbs rules
-TAR_DIR := silo-1.4.13
-include debian/scripts/dbs-build.mk
+STAMP_DIR  = stampdir
+BUILD_TREE = build-tree
+CC         = "gcc-4.1 -m32"
+PWD        = $(shell pwd)
 
-CC = "gcc-4.1 -m32"
+build: $(BUILD_TREE) build-stamp
 
-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(STAMP_DIR)/patch
+build-stamp:
 	dh_testdir
 	cd $(BUILD_TREE) && $(MAKE) CC=$(CC)
-	touch $(STAMP_DIR)/build
+	touch build-stamp
 
+$(BUILD_TREE):
+	mkdir $(BUILD_TREE)
+	tar cf - --exclude debian . | (cd $(BUILD_TREE) && tar xf -)
+	ln -s ../debian/patches $(BUILD_TREE)/patches  
+	cd $(BUILD_TREE) && quilt push -a
+
 clean:
 	dh_testdir
-	rm -rf $(STAMP_DIR) $(SOURCE_DIR)
-	perl debian/scripts/dh_split clean
+	rm -rf $(BUILD_TREE) *-stamp
 	dh_clean
 
-install: build $(dh_mak_deps)
+install: build 
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-	cd $(BUILD_TREE) && $(MAKE) DESTDIR="$(shell pwd)/debian/silo" \
-		install
+	cd $(BUILD_TREE) && $(MAKE) DESTDIR="$(PWD)/debian/silo" install
 	install -m755 debian/local/siloconfig debian/silo/usr/sbin/siloconfig
 
 binary-indep:
 
-binary-arch: build install $(dh_mak_deps)
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs $(BUILD_TREE)/docs/{README{,.tilo}} $(BUILD_TREE)/first-isofs/README.SILO_ISOFS


