From 12ef41a9b1d197e1243ea3009ae818381b7c65ad Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@gmail.com>
Date: Mon, 21 Jul 2014 10:59:47 +0100
Subject: Import Linux chunk into definitions

---
 chunks/linux-x86_64-generic.morph | 99 +++++++++++++++++++++++++++++++++++++++
 strata/bsp-x86_64-generic.morph   |  7 +--
 2 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 chunks/linux-x86_64-generic.morph

diff --git a/chunks/linux-x86_64-generic.morph b/chunks/linux-x86_64-generic.morph
new file mode 100644
index 00000000..02e1945c
--- /dev/null
+++ b/chunks/linux-x86_64-generic.morph
@@ -0,0 +1,99 @@
+name: linux-x86_64-generic
+kind: chunk
+products:
+  - artifact: linux-x86_64-generic-devel
+    include:
+      - (usr/)?src/linux/.*
+  - artifact: linux-x86_64-generic-bins
+    include:
+      - boot/.*
+  - artifact: linux-x86_64-generic-libs
+    include:
+      - lib/.*
+configure-commands:
+  - make defconfig
+  - scripts/config -e PACKET
+  - scripts/config -e SATA_AHCI
+  - scripts/config -e ATA_GENERIC
+  - scripts/config -e HAVE_IDE
+  - scripts/config -d BLK_DEV_IDE_SATA
+  - scripts/config -e BTRFS_FS
+  - scripts/config -e BTRFS_FS_POSIX_ACL
+  - scripts/config -e DEVTMPFS
+  - scripts/config -e DEVTMPFS_MOUNT
+  - scripts/config -e CONFIG_FHANDLE
+  - scripts/config -e CGROUPS
+  - scripts/config -e AUTOFS4_FS
+  - scripts/config --set-str UEVENT_HELPER_PATH ''
+  - scripts/config -e EXT2_FS
+  - scripts/config -e EXT2_FS_XATTR
+  - scripts/config -e EXT2_FS_POSIX_ACL
+  - scripts/config -e EXT2_FS_SECURITY
+  - scripts/config -e EXT2_FS_XIP
+  - scripts/config -e EXT3_FS
+  - scripts/config -d EXT3_DEFAULTS_TO_ORDERED
+  - scripts/config -e EXT3_FS_XATTR
+  - scripts/config -e EXT3_FS_POSIX_ACL
+  - scripts/config -e EXT3_FS_SECURITY
+  - scripts/config -e EXT4_FS
+  - scripts/config -e EXT4_FS_XATTR
+  - scripts/config -e EXT4_FS_POSIX_ACL
+  - scripts/config -e EXT4_FS_SECURITY
+  - scripts/config -d EXT4_DEBUG
+  - scripts/config -d JBD_DEBUG
+  - scripts/config -d JBD2_DEBUG
+  - scripts/config -e BLK_DEV_LOOP
+  - scripts/config -d BLK_DEV_CRYPTOLOOP
+  - scripts/config -e CEPH_FS
+  - scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
+  - scripts/config -e VIRTIO
+  - scripts/config -e VIRTIO_RING
+  - scripts/config -e VIRTIO_PCI
+  - scripts/config -e VIRTIO_BALLOON
+  - scripts/config -e VIRTIO_BLK
+  - scripts/config -e VIRTIO_NET
+  - scripts/config -e VIRTIO_CONSOLE
+  - scripts/config -e HW_RANDOM_VIRTIO
+  - scripts/config -e 9P_FS
+  - scripts/config -e 9P_FSCACHE
+  - scripts/config -e 9P_FS_POSIX_ACL
+  - scripts/config -e NET_9P
+  - scripts/config -e NET_9P_VIRTIO
+  - scripts/config -e R8169
+  - scripts/config -e 8139TOO
+  - scripts/config -e 8139CP
+  - scripts/config -e IKCONFIG
+  - scripts/config -e IKCONFIG_PROC
+  - scripts/config -e SECCOMP
+  - scripts/config -d DEBUG_STACK_TRACE
+  - scripts/config -e NFSD
+  - scripts/config -e NFSD_V3
+  - scripts/config -e KVM
+  - scripts/config -e TUN
+  - scripts/config -e BRIDGE
+  - scripts/config -e VHOST_NET
+  - scripts/config -e NF_NAT
+  - scripts/config -e NF_NAT_IPV4
+  - scripts/config -e IP_NF_TARGET_MASQUERADE
+  - scripts/config -e FB_VESA
+  - yes '' | make oldconfig
+build-commands:
+  - make $MAKEFLAGS
+install-commands:
+  - mkdir -p "$DESTDIR"/boot
+  - make INSTALL_PATH="$DESTDIR"/boot install
+  - make INSTALL_MOD_PATH="$DESTDIR" modules_install
+  - install -d "$DESTDIR$PREFIX/src/linux"
+  - |
+    (
+        printf 'Makefile\0'
+        printf 'Module.symvers\0'
+        find arch/x86 -maxdepth 1 -name 'Makefile*' -print0
+        find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+        find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \
+                                 \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+        find include -name 'asm*' -prune -o -print0
+        find include/asm-generic -print0
+        find include/uapi -print0
+        find scripts -print0
+    ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 6c604230..4e10648c 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -5,10 +5,11 @@ description: The set of platform specific components required for booting a 64-b
 build-depends:
 - morph: strata/core.morph
 chunks:
-- name: linux-x86-64-generic
+- name: linux-x86_64-generic
+  morph: chunks/linux-x86_64-generic.morph
   repo: upstream:linux
-  ref: d67a0e110187abd560a1de63fa172894a52839d5
-  unpetrify-ref: baserock/morph
+  ref: 1860e379875dfe7271c649058aeddffe5afd9d0d
+  unpetrify-ref: refs/tags/v3.15
   build-depends: []
 - name: nasm
   repo: upstream:nasm
-- 
cgit v1.2.1