Changeset 5817 in /cluster/svnroot

Timestamp:

Oct 10, 2016 10:57:32 PM (4 years ago)

Author:

skylar

Message:

install kernel and initrd re #962

File:

• bccd-ng/branches/skylar/bccd-3.4.0-build_ng/Makefile (modified) (4 diffs)

bccd-ng/branches/skylar/bccd-3.4.0-build_ng/Makefile

@@ -1 +1 @@
 # $Id$
 
-MKDIR_P :=      mkdir -p
-SVNROOT :=      https://cluster.earlham.edu/svn/bccd-ng/branches/skylar/bccd-3.4.0-build_ng
-SVN_REV =       $(shell svn info $(SVNROOT)|awk '$$1 ~ /^Revision:/ {print $$2}')
-SVN_CO  :=      svn cat -r
-VERSION :=      3.4.0
+MKDIR_P         :=      mkdir -p
+SVNROOT         :=      https://cluster.earlham.edu/svn/bccd-ng/branches/skylar/bccd-3.4.0-build_ng
+SVN_REV         =       $(shell svn info $(SVNROOT)|awk '$$1 ~ /^Revision:/ {print $$2}')
+SVN_CO          :=      svn cat -r
+VERSION         :=      3.4.0
+KERN_REV        :=      4.0.0bccd
 
 target/bccd.noarch.deb: 
@@ -32 +33 @@
                 && /usr/bin/sudo /usr/sbin/chroot "$(WORKSPACE)/debootstrap" /usr/bin/dpkg --force-confnew -i /tmp/bccd.noarch.deb \
                 && /usr/bin/sudo /usr/sbin/chroot "$(WORKSPACE)/debootstrap" apt-get update \
-                && /usr/bin/sudo /usr/sbin/chroot "$(WORKSPACE)/debootstrap" apt-get install \
+                && /usr/bin/sudo /usr/sbin/chroot "$(WORKSPACE)/debootstrap" apt-get -o Dpkg::Options::="--force-confnew" install \
                         libfftw3-bin \
                         libfftw3-dev \
@@ -48 +49 @@
                         r \
                         mpi4py \
-                        linux-image-4.0.0bccd
+                        initramfs-tools \
+                        linux-image-$(KERN_REV) \
+
+iso/live/initrd.img: debootstrap
+        /usr/bin/sudo /usr/sbin/chroot "$(WORKSPACE)/debootstrap" mkinitramfs \
+                -d /etc/initramfs-tools.diskless \
+                -o /boot/initrd-$(KERN_REV).diskless $(KERN_REV)
+        /bin/cp "$(WORKSPACE)/debootstrap/boot/initrd-$(KERN_REV).diskless" "$(WORKSPACE)/$@"
+
+iso/live/vmlinuz: debootstrap
+        /bin/cp "$(WORKSPACE)/debootstrap/boot/vmlinuz-$(KERN_REV)" "$(WORKSPACE)/$@"
 
 iso/live/filesystem.squashfs: debootstrap
@@ -56 +67 @@
                 -comp xz
 
-target/bccd.amd64.iso: iso/live/filesystem.squashfs
+target/bccd.amd64.iso: iso/live/filesystem.squashfs iso/live/initrd.img iso/live/vmlinuz
         /usr/bin/genisoimage \
                 -pad \