diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b25c15b81fae06e1c55946ac6270bfdb293870e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/Makefile b/Makefile
index 9e3691a63340e866fb3920134976f0abb116f440..07aafe241cc96b718c1782b7500d7924d17f7049 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,13 @@
-BUILD_DIST=/tmp
-DIST_KS=fedora-live-base.ks fedora-live-desktop.ks \
- fedora-livecd-desktop.ks fedora-live-minimization.ks
+FEDORA_RELEASE=23
+
+BUILD_DIR=/var/tmp
+DIST_KS=fedora-live-base.ks \
+ fedora-live-workstation.ks \
+ fedora-workstation-packages.ks \
+ snippets/packagekit-cached-metadata.ks \
+ fedora-live-minimization.ks
XENOMAI_VERSION=2.6.35.7_xenomai2.5.5.2_rtnet39f7fcf
+ORCA_DIR=$(shell pwd)
all:
echo "Select a target"
@@ -13,11 +19,14 @@ setup: $(DIST_KS)
# --fslabel=Orca-2.6.37.3 \
# --cache=/var/cache/live0
-build-%:
- cd $(BUILD_DIST) ; livecd-creator --config=/home/andersb/work/robot/extctrl_dist/livecd/orca-$*.ks \
- --tmpdir=$(BUILD_DIST) \
- --fslabel=Orca-$* \
- --cache=/var/cache/live0
+build-%: setup
+ cd $(BUILD_DIR) ; \
+ sudo livecd-creator \
+ --releasever=$(FEDORA_RELEASE) \
+ --config=$(ORCA_DIR)/orca-$*.ks \
+ --tmpdir=$(BUILD_DIR) \
+ --fslabel=$(shell echo Orca-$* | cut -c1-32)\
+ --cache=/var/cache/live0
#build:
# cd /tmp ; livecd-creator --config=/home/andersb/work/robot/extctrl_dist/livecd/orca.ks \
@@ -30,6 +39,11 @@ make_usb:
kernel_rpm: /root/rpmbuild/RPMS/i386/kernel-$(XENOMAI_VERSION)-4.i386.rpm
+snippets/%.ks: /usr/share/spin-kickstarts/snippets/%.ks
+ mkdir -p snippets
+ cp -p $< $@
+ if [ -f $@.patch ] ; then patch -p1 < $@.patch ; fi
+
%.ks: /usr/share/spin-kickstarts/%.ks
cp -p $< $@
if [ -f $@.patch ] ; then patch -p1 < $@.patch ; fi
diff --git a/fedora-live-base.ks.patch b/fedora-live-base.ks.patch
index 41f551578e6973a92a032331259d7611c9fea8e7..4d664de4a8c74dc5399322039dce9f781c395330 100644
--- a/fedora-live-base.ks.patch
+++ b/fedora-live-base.ks.patch
@@ -1,20 +1,11 @@
-diff -u /usr/share/spin-kickstarts/fedora-live-base.ks ./fedora-live-base.ks
---- /usr/share/spin-kickstarts/fedora-live-base.ks 2010-10-31 14:36:36.000000000 +0100
-+++ ./fedora-live-base.ks 2010-11-11 14:38:16.000000000 +0100
-@@ -17,10 +17,12 @@
- part / --size 3072 --fstype ext4
- services --enabled=NetworkManager --disabled=network,sshd
+--- fedora-live-base.ks~ 2015-11-06 09:32:23.000000000 +0100
++++ fedora-live-base.ks 2015-11-23 12:54:36.581698131 +0100
+@@ -17,7 +17,7 @@
+ part / --size 4096 --fstype ext4
+ services --enabled=NetworkManager,ModemManager --disabled=network,sshd
--#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
--repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=$basearch
--repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=$basearch
--#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f14&arch=$basearch
-+repo --name=release --baseurl=file:///work/Fedora-14/i386/Fedora.release
-+repo --name=updates --baseurl=file:///work/Fedora-14/i386/Fedora.updates
-+repo --name=rpmfusion_free_release --baseurl=file:///work/Fedora-14/i386/rpmfusion_free.release
-+repo --name=rpmfusion_free_updates --baseurl=file:///work/Fedora-14/i386/rpmfusion_free.updates
-+repo --name=rpmfusion_nonfree_release --baseurl=file:///work/Fedora-14/i386/rpmfusion_nonfree.release
-+repo --name=rpmfusion_nonfree_updates --baseurl=file:///work/Fedora-14/i386/rpmfusion_nonfree.updates
+-%include fedora-repo.ks
++%include orca-repo.ks
%packages
@base-x
diff --git a/orca-3.8.13-xenomai-2.6.4-rtnet-7c8ba1.ks b/orca-3.8.13-xenomai-2.6.4-rtnet-7c8ba1.ks
new file mode 100644
index 0000000000000000000000000000000000000000..a8c237aed6105890bed0e2e15cbbed804243214b
--- /dev/null
+++ b/orca-3.8.13-xenomai-2.6.4-rtnet-7c8ba1.ks
@@ -0,0 +1,81 @@
+#
+# Setup for mio install (put our post rules first to
+# ensure cleanup tasks affects our stuff as well)
+#
+%post --nochroot
+ cp /etc/resolv.conf ${INSTALL_ROOT}/etc/resolv.conf
+%end
+
+%post
+#
+# Do mio install
+#
+echo "Live cd from control at `/bin/date`" >> /etc/issue
+(
+ date
+ set -x
+ PATH=/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
+ export PATH
+ FEDORA=$(sed -e 's/Fedora release \([0-9]*\).*/\1/' /etc/fedora-release)
+ REPO=http://dist.control.lth.se/public/Fedora-${FEDORA}/$(uname -i)
+ MIO=http://dist.control.lth.se/private/mio
+
+ /usr/bin/curl --silent --fail --output /usr/local/bin/mio ${MIO}/bin/mio
+ chmod +x /usr/local/bin/mio
+ /usr/local/bin/mio -vv \
+ --exclude-rpm kernel \
+ --exclude-rpm kernel-PAE \
+ --path ${MIO} \
+ --path ${REPO}/Fedora.release \
+ --path ${REPO}/Fedora.updates \
+ --path ${REPO}/Fedora.fixes \
+ --path ${REPO}/regler \
+ --path ${REPO}/rpmfusion_free.release \
+ --path ${REPO}/rpmfusion_free.updates \
+ --path ${REPO}/rpmfusion_nonfree.release \
+ --path ${REPO}/rpmfusion_nonfree.updates \
+ --path ${REPO}/livna.release \
+ --path ${REPO}/external \
+ --install /orca/-/livecd-${FEDORA}
+ date
+ rm /etc/resolv.conf
+) | tee /mio.log
+# If SELinux enabled:
+# Probaly should do a setfiles here (or in the nochroot below)
+%end
+
+#
+# Cleanup after mio install
+#
+%post --nochroot
+%end
+
+
+%include fedora-live-workstation.ks
+
+selinux --disabled
+
+%packages
+-kernel
+xenomai-2.6.4-linux.3.8.13.rtnet.7c8ba1
+xenomai-2.6.4-devel-linux.3.8.13.rtnet.7c8ba1
+#xenomai-2.6.4-headers-linux.3.8.13.rtnet.7c8ba1
+kernel-headers
+xenomai-2.6.4-extra-linux.3.8.13.rtnet.7c8ba1
+
+# Used by mio install
+python2
+python2-dnf
+curl
+
+# Other useful stuff
+gftp
+gpm
+strace
+vim-enhanced
+zsh
+
+# Needed
+gcc
+%end
+
diff --git a/orca-repo.ks b/orca-repo.ks
new file mode 100644
index 0000000000000000000000000000000000000000..3423204d774466061f79485e16614e1b1120907d
--- /dev/null
+++ b/orca-repo.ks
@@ -0,0 +1,7 @@
+repo --name=release --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=fedora.release
+repo --name=updates --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=fedora.updates
+repo --name=rpmfusion_free_release --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=rpmfusion_free.release
+repo --name=rpmfusion_free_updates --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=rpmfusion_free.updates
+repo --name=rpmfusion_nonfree_release --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=rpmfusion_nonfree.release
+repo --name=rpmfusion_nonfree_updates --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=rpmfusion_nonfree.updates
+repo --name=regler --mirrorlist=http://dist.control.lth.se/mirrorlist/get?version=fedora-23&arch=$basearch&repo=regler