Clean descriptions + add arch sys config back

oar-team · Sep 7, 2016 · 25ccd82 · 25ccd82
1 parent f13b766
commit 25ccd82
Show file tree

Hide file tree

Showing 31 changed files with 57 additions and 33 deletions.
diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ROOT_PROJECT=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
-BUILD_PATH=$ROOT_PROJECT/build
+BUILD_PATH=/tmp/from_scratch
 ROOTFS_PATH=$ROOT_PROJECT/rootfs
 
 trap ctrl_c INT
@@ -18,7 +18,8 @@ for RECIPE_PATH in `ls from_scratch/*.yaml`; do
     if [ ! -e "$ROOTFS_PATH/${RECIPE_NAME}.tar.xz" ]; then
         rm -rf $BUILD_PATH
         echo -e "===============================================================\n\n"
-        (set -x; kameleon build $ROOT_PROJECT/$RECIPE_PATH --build-path $BUILD_PATH --script --enable-cache)
+        (set -x; kameleon build $ROOT_PROJECT/$RECIPE_PATH --build-path \
+                    $BUILD_PATH --script --enable-cache --global disk_cache:unsafe)
         if [ $? -eq 0 ]; then
             mkdir -p $ROOTFS_PATH
             mv $BUILD_PATH/$RECIPE_NAME/*.tar.{gz,xz} $ROOTFS_PATH/

diff --git a/from_image/base.yaml b/from_image/base.yaml
@@ -19,7 +19,7 @@ env:
 # Global variables use by Kameleon engine and the steps
 global:
   ## Select backend for in context isolation
-  backend: virtualbox
+  backend: qemu
 
   ## User varibales : used by the recipe
   user_name: kameleon

diff --git a/from_image/centos6.yaml b/from_image/centos6.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Centos 6 base system built with chroot.
+# DESCRIPTION: Centos 6 base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/centos7.yaml b/from_image/centos7.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Centos 6 base system built with chroot.
+# DESCRIPTION: Centos 6 base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/debian7.yaml b/from_image/debian7.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 7 (Wheezy) appliance built with chroot.
+# DESCRIPTION: Debian 7 (Wheezy) appliance.
 #
 #==============================================================================
 ---

diff --git a/from_image/debian8.yaml b/from_image/debian8.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 8 (Jessie) base system built with chroot.
+# DESCRIPTION: Debian 8 (Jessie) base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/fedora20.yaml b/from_image/fedora20.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 20 base system built with chroot.
+# DESCRIPTION: Fedora 20 base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/fedora21.yaml b/from_image/fedora21.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 21 base system built with chroot.
+# DESCRIPTION: Fedora 21 base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/fedora22.yaml b/from_image/fedora22.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 22 base system built with chroot.
+# DESCRIPTION: Fedora 22 base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/ubuntu12.04.yaml b/from_image/ubuntu12.04.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 12.04 LTS base system built with chroot.
+# DESCRIPTION: Ubuntu 12.04 LTS base system.
 #
 #==============================================================================
 ---

diff --git a/from_image/ubuntu14.04.yaml b/from_image/ubuntu14.04.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 14.04 LTS base system built with chroot.
+# DESCRIPTION: Ubuntu 14.04 LTS base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/archlinux.yaml b/from_scratch/archlinux.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Archlinux base system built with qemu-kvm.
+# DESCRIPTION: Archlinux base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/centos-netinstall.yaml b/from_scratch/centos-netinstall.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Centos netinstall base system built with qemu-kvm + Kickstart.
+# DESCRIPTION: Centos netinstall base system + Kickstart.
 #
 # USAGE: Select the release_major and release_minor
 #

diff --git a/from_scratch/centos6.yaml b/from_scratch/centos6.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Centos 6 base system built with qemu-kvm.
+# DESCRIPTION: Centos 6 base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/centos7.yaml b/from_scratch/centos7.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Centos 7 base system built with qemu-kvm.
+# DESCRIPTION: Centos 7 base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/debian-debootstrap.yaml b/from_scratch/debian-debootstrap.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian generic recipe built with qemu-kvm + debootstrap.
+# DESCRIPTION: Debian generic recipe + debootstrap.
 #
 # USAGE:
 #   Select directly in this recipe:

diff --git a/from_scratch/debian-netinstall.yaml b/from_scratch/debian-netinstall.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian generic system built with qemu-kvm + netinstall ISO.
+# DESCRIPTION: Debian generic system + netinstall ISO.
 #
 # USAGE:
 #   Select directly in this recipe: see usage example commented in the global of

diff --git a/from_scratch/debian-sid.yaml b/from_scratch/debian-sid.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian sid base system built with qemu-kvm.
+# DESCRIPTION: Debian sid base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/debian-testing.yaml b/from_scratch/debian-testing.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian testing base system built with qemu-kvm.
+# DESCRIPTION: Debian testing base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/debian7.yaml b/from_scratch/debian7.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 7 (Wheezy) base system built with qemu-kvm.
+# DESCRIPTION: Debian 7 (Wheezy) base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/debian8-arm64.yaml b/from_scratch/debian8-arm64.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 8 (Jessie) system for arm64 built with qemu-kvm +
+# DESCRIPTION: Debian 8 (Jessie) system for arm64 +
 # qemu-user-static.
 #
 #==============================================================================

diff --git a/from_scratch/debian8.yaml b/from_scratch/debian8.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Debian 8 (Jessie) base system built with qemu-kvm.
+# DESCRIPTION: Debian 8 (Jessie) base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/fedora-base-bootstrap.yaml b/from_scratch/fedora-base-bootstrap.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora generic base system built with qemu-kvm.
+# DESCRIPTION: Fedora generic base system.
 #
 # USAGE: Select the release
 #==============================================================================

diff --git a/from_scratch/fedora20.yaml b/from_scratch/fedora20.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 20 base system built with qemu-kvm.
+# DESCRIPTION: Fedora 20 base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/fedora21.yaml b/from_scratch/fedora21.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 21 base system built with qemu-kvm.
+# DESCRIPTION: Fedora 21 base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/fedora22.yaml b/from_scratch/fedora22.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 22 base system built with qemu-kvm.
+# DESCRIPTION: Fedora 22 base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/fedora23.yaml b/from_scratch/fedora23.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Fedora 23 base system built with qemu-kvm.
+# DESCRIPTION: Fedora 23 base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/ubuntu-base-bootstrap.yaml b/from_scratch/ubuntu-base-bootstrap.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 12.04 LTS base system built with qemu-kvm.
+# DESCRIPTION: Ubuntu 12.04 LTS base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/ubuntu12.04.yaml b/from_scratch/ubuntu12.04.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 12.04 LTS base system built with qemu-kvm.
+# DESCRIPTION: Ubuntu 12.04 LTS base system.
 #
 #==============================================================================
 ---

diff --git a/from_scratch/ubuntu14.04.yaml b/from_scratch/ubuntu14.04.yaml
@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 14.04 LTS base system built with qemu-kvm.
+# DESCRIPTION: Ubuntu 14.04 LTS base system.
 #
 #==============================================================================
 ---

diff --git a/steps/setup/archlinux/configure_system.yaml b/steps/setup/archlinux/configure_system.yaml
@@ -1,2 +1,25 @@
-- configure_system:
-  - exec_in: echo "Nothing to do !"
+# System configuration for Archlinux
+#
+# This will set the locals and the timezone
+
+- set_locales:
+  # uncomment the locales
+  - exec_in: |
+      test ! -f /etc/locale.gen || \
+        (echo $${locales} | tr ' ' '\n' | xargs -I {} sed -i 's/^#{}/{}/' /etc/locale.gen)
+  # generate the locales
+  - exec_in: locale-gen
+  # save and apply
+  - exec_in: echo LANG=$${lang} > /etc/locale.conf
+  - exec_in: export LANG=$${lang}
+
+- set_timezone:
+  - exec_in: |
+      rm -f /etc/localtime
+      ln -s /usr/share/zoneinfo/$${timezone} /etc/localtime
+
+- set_wheel_sudo:
+  - exec_in: echo "%wheel      ALL=(ALL) ALL" >> /etc/sudoers
+
+- set_root_password:
+  - exec_in: echo -n 'root:$${root_password}' | chpasswd