Changeset 875

Timestamp:

Jan 6, 2008 6:22:48 PM (5 years ago)

Author:

jrollins

Message:

debirf: new version, now non-native, see changelog

Location:

trunk/debirf

Files:

• Makefile (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/docs (deleted)
• debian/rules (modified) (2 diffs)
• fs/usr/bin/make-debirf (modified) (2 diffs)
• fs/usr/share/debirf/modules/apt-get-disk-rescue (modified) (1 diff)

trunk/debirf/Makefile

@@ -7 +7 @@
 # profile directories
 
+PREFIX=/usr
+
 PROF_DIR=example-profiles
 
 all:
+        echo "debirf is composed of scripts, so no compilation is necessary"
 
 $(PROF_DIR)/minimal.tgz:
@@ -20 +23 @@
         cd $(PROF_DIR) && tar czf xkiosk.tgz xkiosk/
 
-release: $(PROF_DIR)/minimal.tgz $(PROF_DIR)/rescue.tgz $(PROF_DIR)/xkiosk.tgz
+build-profiles: $(PROF_DIR)/minimal.tgz $(PROF_DIR)/rescue.tgz $(PROF_DIR)/xkiosk.tgz
+
+install: build-profiles
+        install -d $(PREFIX)/bin
+        install -d $(PREFIX)/share/debirf/modules
+        install -d $(PREFIX)/share/debirf/example-profiles
+        install -d $(PREFIX)/lib/debirf
+        install -d $(PREFIX)/share/man/man1
+        install fs/usr/bin/make-debirf $(PREFIX)/bin/make-debirf
+        install fs/usr/bin/build-debirf-kernel $(PREFIX)/bin/build-debirf-kernel
+        install fs/usr/share/debirf/common $(PREFIX)/share/debirf/
+        install -m 0644 fs/usr/share/debirf/debirf.conf.defaults $(PREFIX)/share/debirf/
+        install fs/usr/share/debirf/modules/* $(PREFIX)/share/debirf/modules/
+        install -m 0644 fs/usr/lib/debirf/devices.tar.gz $(PREFIX)/lib/debirf/
+        install -m 0644 fs/usr/lib/debirf/README $(PREFIX)/lib/debirf/
+        install -m 0644 fs/usr/share/man/man1/make-debirf.1 $(PREFIX)/share/man/man1/make-debirf.1
+        install -m 0644 fs/usr/share/man/man1/build-debirf-kernel.1 $(PREFIX)/share/man/man1/build-debirf-kernel.1
+        install -m 0644 example-profiles/*.tgz $(PREFIX)/share/debirf/example-profiles/
+
+release: 
         mkdir -p build/upstream
         ln -s ../.. build/upstream/debirf-$(VERSION)

trunk/debirf/debian/changelog

@@ -1 @@
-debirf (0.13) unstable; urgency=low
+debirf (0.13-1) unstable; urgency=low
 
-  * example profiles are now tgz archives.
+  * example profiles are now tgz archives (closes #46)
+  * added new full devices.tar.gz to create fuller device tree (closes #60)
+  * transition to non-native packaging (closes #26)
+  * added exit-on-error to modules install run-part
 
- -- Jameson Rollins <jrollins@fifthhorseman.net>  Sat, 05 Jan 2008 12:00:37 -0500
+ -- Jameson Rollins <jrollins@fifthhorseman.net>  Sun, 06 Jan 2008 17:22:20 -0500
 
 debirf (0.12) unstable; urgency=low

trunk/debirf/debian/rules

@@ -10 +10 @@
 # not much to do here, since we're just moving some shell scripts
 # around.
+
+PROF_DIR=example-profiles
+
+all:
 
 build:
@@ -24 +28 @@
         dh_link
 
-        cp -a fs/usr $(CURDIR)/debian/debirf
+        $(MAKE) install PREFIX=$(CURDIR)/debian/debirf/usr
 
 binary-indep: build install

trunk/debirf/fs/usr/bin/make-debirf

@@ -104 +104 @@
         export $var
     done
-    fakeroot_if_needed run-parts --verbose "$DEBIRF_MODULES"
+    fakeroot_if_needed run-parts --verbose --exit-on-error "$DEBIRF_MODULES"
 }
 
@@ -356 +356 @@
 
 # set fakechroot save file
-DEBIRF_FAKEROOT_STATE="$DEBIRF_BUILDD/.fakeroot-${DEBIRF_LABEL}.save"
+DEBIRF_FAKEROOT_STATE="$DEBIRF_BUILDD/.fakeroot-state_${DEBIRF_LABEL}"
 if [ "$ROOT_BUILD" != 'true' ] ; then
     > "$DEBIRF_FAKEROOT_STATE"

trunk/debirf/fs/usr/share/debirf/modules/apt-get-disk-rescue

@@ -12 +12 @@
 # version 3 or later.
 
-debirf_exec apt-get --assume-yes install less moreutils lvm2 mdadm lsof screen hdparm smartmontools pciutils
+# why does aptitude not seem to be recognizing --without-recommends option?
+# currently requires explicitly not installing:
+# courier-mta mailx bsd-mailx
+debirf_exec aptitude --without-recommends --assume-yes install less moreutils lvm2 lsof screen hdparm pciutils mdadm smartmontools courier-mta- mailx- bsd-mailx-
 
 debirf_exec /etc/init.d/mdadm stop