Changeset 328

Timestamp:

Mar 13, 2007 8:47:09 PM (6 years ago)

Author:

dkg

Message:

debirf: removed some global variables, unused extras/ directory, and defaulting to FHS-compliant location (/var/lib/debirf) for automated build.

Location:

trunk/debirf

Files:

• etc/debirf/debirf.conf (modified) (2 diffs)
• usr/sbin/make-debirf (modified) (5 diffs)
• usr/share/debirf/plugins/install/install-kernel (modified) (1 diff)
• usr/share/debirf/plugins/prune/remove-locales (modified) (1 diff)
• var (added)
• var/lib (added)
• var/lib/debirf (added)

trunk/debirf/etc/debirf/debirf.conf

@@ -6 +6 @@
 
 # where to build the debirf
-DEBIRF_PATH=${DEBIRF_PATH:-"/srv/debirf"}
+DEBIRF_PATH=${DEBIRF_PATH:-"/var/lib/debirf"}
 
 # the debirf root, used by plugins
@@ -21 +21 @@
 DEBIRF_MIRROR=${DEBIRF_MIRROR:-"http://mirrors.kernel.org/debian"}
 
-# what distribution should be the default?
+# what distribution should debirf be built from?
 DEBIRF_DISTRO=${DEBIRF_DISTRO:-etch}

trunk/debirf/usr/sbin/make-debirf

@@ -70 +70 @@
 }
 
+## create_initrd functions take the name of the targeted initrd as
+## their first argument.
+ 
 ### stupid simple method
 create_initrd_stupid_simple() {
@@ -77 +80 @@
     # create root image
     msg "creating debirf initrd..."
-    ( cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) > "$DEBIRF_INITRD"
+    ( cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) > "$1"
 }
 
-### tweak initrd method
+### tweak initrd method: untested, probably doesn't work right yet.  soon!
 create_initrd_tweak_initrd() {
     cat scripts/debirf <<EOF
@@ -101 +104 @@
     msg "creating debirf initrd..."
     cp extra/boot/"$INITRD" debirf.cgz
-    (cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) >> "$DEBIRF_INITRD"
+    (cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) >> "$1"
 }
 
@@ -115 +118 @@
     DEBIRF_KERNEL_PACKAGE="$1"
     [ -f "$DEBIRF_KERNEL_PACKAGE" ] || failure "Specified kernel package $DEBIRF_KERNEL_PACKAGE not found."
-
-    KERNEL="vmlinu*"$(dpkg -I "$DEBIRF_KERNEL_PACKAGE" | grep 'Package:' | awk '{ print $2 }' | sed -s s/'linux-image-'//)
 fi
 
@@ -170 +171 @@
 
 KERNAVAIL=$(ls -1 "$DEBIRF_ROOT/lib/modules" | head -n1)
-DEBIRF_INITRD="${DEBIRF_LABEL}_${DEBIRF_DISTRO}_${KERNAVAIL}.cgz"
-create_initrd_${DEBIRF_METHOD}
+create_initrd_${DEBIRF_METHOD} "${DEBIRF_LABEL}_${DEBIRF_DISTRO}_${KERNAVAIL}.cgz"
 
 # final output
+KERNEL="$DEBIRF_PATH/vmlinu"*
 if [ "$KERNEL" ] ; then
-    ln -sf  "extras/boot/$KERNEL" vmlinuz
-    msg "kernel: $DEBIRF_PATH/vmlinuz"
+    msg "kernel: $KERNEL"
 fi
 msg "initrd: $DEBIRF_PATH/$DEBIRF_INITRD"

trunk/debirf/usr/share/debirf/plugins/install/install-kernel

@@ -25 +25 @@
     
     # extract kernel, debian stock initrd, and remove them from the fs:
-    mkdir -p extras/boot
-    mv "$DEBIRF_ROOT"/boot/vmlinu* extras/boot/
-    mv "$DEBIRF_ROOT"/boot/initrd* extras/boot/
+    mv "$DEBIRF_ROOT"/boot/vmlinu* .
+    mv "$DEBIRF_ROOT"/boot/initrd* .
 }
 

trunk/debirf/usr/share/debirf/plugins/prune/remove-locales

@@ -2 +2 @@
 
 # remove locales
-
-mkdir -p extras/usr/share/locale
 cd "$DEBIRF_ROOT" 
 find usr/share/locale -maxdepth 1 -mindepth 1 -type d ! -iname 'en*' -exec rm -rf '{}' \;