Extra modules via EXTRA_MODULES_URL setting implemented

Moved to Ubuntu-4.4.0-23.41-rancher kernel for newer BTRFS version first of all (since BTRFS is relatively young but is developed quite intensively)
Change repo paths to my forked till my os-base changes are pulled to original
2016-06-05 04:05:28 +00:00 · 2016-06-05 00:49:40 +00:00 · 2016-06-04 23:11:58 +00:00
4 changed files with 19 additions and 6 deletions
--- a/8
+++ b/8
@@ -39,6 +39,12 @@ else
 	touch $@
 endif

+assets/extra.tar.gz:
+ifdef EXTRA_MODULES_URL
+	mkdir -p $(dir $@)
+	curl -L "$(EXTRA_MODULES_URL)" > $@
+endif
+
 ifdef COMPILED_KERNEL_URL

 installer: minimal
@@ -54,7 +60,7 @@ build/kernel/:
 	wget -O - "$(COMPILED_KERNEL_URL)" | tar -xzf - -C $@


-dist/artifacts/initrd: bin/ros assets/docker assets/selinux/policy.29 build/kernel/ build/images.tar assets/modules.tar.gz
+dist/artifacts/initrd: bin/ros assets/docker assets/selinux/policy.29 build/kernel/ build/images.tar assets/modules.tar.gz assets/extra.tar.gz
 	mkdir -p $(dir $@)
 	HOST_SUFFIX=$(HOST_SUFFIX) SUFFIX=$(SUFFIX) DFS_IMAGE=$(DFS_IMAGE) DEV_BUILD=$(DEV_BUILD) \
 	       KERNEL_RELEASE=$(KERNEL_RELEASE) ARCH=$(ARCH) ./scripts/mk-initrd.sh $@
--- a/build.conf
+++ b/build.conf
@@ -1,8 +1,8 @@
-IMAGE_NAME=rancher/os
-VERSION=v0.4.4-dev
+IMAGE_NAME=tetatetit/os
+VERSION=v0.4.5
 DFS_IMAGE=rancher/docker:v1.10.3
 SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.2/policy.29

 HOSTNAME_DEFAULT=rancher
-OS_IMAGES_ROOT=rancher
+OS_IMAGES_ROOT=tetatetit
 OS_SERVICES_REPO=https://raw.githubusercontent.com/rancher/os-services
--- a/build.conf.amd64
+++ b/build.conf.amd64
@@ -1,7 +1,8 @@
 DAPPER_BASE=ubuntu:16.04
 TOOLCHAIN= #empty

-COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-34.39-rancher/linux-4.2.8-ckt4-rancher-x86.tar.gz
+COMPILED_KERNEL_URL=https://github.com/tetatetit/os-kernel/releases/download/Ubuntu-4.4.0-23.41-rancher-kvm/linux-4.4.10-rancher-x86.tar.gz
 DOCKER_BINARY_URL=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3
 OS_RELEASES_YML=https://releases.rancher.com/os/releases.yml
-VBOX_MODULES_URL=https://github.com/rancher/os-vbox/releases/download/v0.0.2/vbox-modules.tar.gz
+VBOX_MODULES_URL=https://github.com/tetatetit/os-vbox/releases/download/Ubuntu-4.4.0-23.41-rancher/vbox-modules.tar.gz
+#EXTRA_MODULES_URL=https://github.com/tetatetit/os-kernel/releases/download/Ubuntu-4.4.0-23.41-rancher-kvm/extra.tar.gz
--- a/scripts/mk-initrd.sh
+++ b/scripts/mk-initrd.sh
@@ -42,6 +42,12 @@ if [ "$ARCH" == "amd64" ]; then
  depmod -a -b ${INITRD_DIR}/usr $KERNEL_RELEASE
 fi

+if [ -e assets/extra.tar.gz ]; then
+  KERNEL_RELEASE=$(tar xvf assets/extra.tar.gz -C ${INITRD_DIR}/usr | cut -f4 -d/ | cut -f1 -d ' ')
+  rm -rf ${INITRD_DIR}/usr/lib/firmware/.git
+  depmod -a -b ${INITRD_DIR}/usr $KERNEL_RELEASE
+fi
+
 DFS_ARCH=$(docker create ${DFS_IMAGE}${SUFFIX})
 trap "docker rm -fv ${DFS_ARCH}" EXIT
Author	SHA1	Message	Date
Serhiy Berezin	10a6698cb5	Extra modules via EXTRA_MODULES_URL setting implemented	2016-06-05 04:05:28 +00:00
Serhiy Berezin	aaba61b386	Moved to Ubuntu-4.4.0-23.41-rancher kernel for newer BTRFS version first of all (since BTRFS is relatively young but is developed quite intensively)	2016-06-05 00:49:40 +00:00
Serhiy Berezin	d0357e9c32	Change repo paths to my forked till my os-base changes are pulled to original	2016-06-04 23:11:58 +00:00