Hello community,
here is the log from the commit of package dice for openSUSE:Factory checked in
at 2015-05-27 12:53:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dice (Old)
and /work/SRC/openSUSE:Factory/.dice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dice/dice.changes 2015-05-18
22:28:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dice.new/dice.changes 2015-05-27
12:53:02.000000000 +0200
@@ -1,0 +2,30 @@
+Tue May 19 21:44:50 CEST 2015 - m...@suse.de
+
+- Version 0.6.1
+
+-------------------------------------------------------------------
+Tue May 19 21:43:47 CEST 2015 - m...@suse.de
+
+- Adapt package spec, remove recipes
+
+-------------------------------------------------------------------
+Tue May 19 21:37:33 CEST 2015 - m...@suse.de
+
+- Delete recipes
+
+ The recipes are basically duplicates from the JeOS descriptions
+ provided by kiwi-templates. Now that the kiwi-templates are
+ prepared for dice (provides a Vagrantfile) we refer to one
+ central place instead of duplicating descriptions
+
+-------------------------------------------------------------------
+Tue May 19 21:34:12 CEST 2015 - m...@suse.de
+
+- Update README
+
+ Change default provider setup to docker. This allows to directly
+ refer to the kiwi-templates which contains all dice configs to
+ build contained. In addition using docker is much faster than
+ virtualbox. Thus I recommend this system
+
+-------------------------------------------------------------------
Old:
----
dice-0.5.3.gem
New:
----
dice-0.6.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dice.spec ++++++
--- /var/tmp/diff_new_pack.pp6s8p/_old 2015-05-27 12:53:02.000000000 +0200
+++ /var/tmp/diff_new_pack.pp6s8p/_new 2015-05-27 12:53:02.000000000 +0200
@@ -17,7 +17,7 @@
Name: dice
-Version: 0.5.3
+Version: 0.6.1
Release: 0
%define mod_name dice
%define mod_full_name %{mod_name}-%{version}
@@ -67,7 +67,7 @@
# Install the Ruby source
%gem_install \
--symlink-binaries \
- --doc-files="COPYING recipes key" \
+ --doc-files="COPYING key" \
-f
# Change to ruby gem dir
++++++ dice-0.5.3.gem -> dice-0.6.1.gem ++++++
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/version.rb new/lib/version.rb
--- old/lib/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/version.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +1,3 @@
module Dice
- VERSION = "0.5.3"
+ VERSION = "0.6.1"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: dice
version: !ruby/object:Gem::Version
- version: 0.5.3
+ version: 0.6.1
platform: ruby
authors:
- SUSE
autorequire:
bindir: bin
cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: cheetah
@@ -162,22 +162,6 @@
- bin/dice
- completion/dice.sh
- key/vagrant
-- recipes/suse-13.2-JeOS/root/etc/motd
-- recipes/suse-13.2-JeOS/config.xml
-- recipes/suse-13.2-JeOS/config.sh
-- recipes/suse-13.2-JeOS/Dicefile
-- recipes/suse-SLE12-JeOS/Vagrantfile
-- recipes/suse-SLE12-JeOS/root/etc/udev/rules.d/70-persistent-net.rules
-- recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0
-- recipes/suse-SLE12-JeOS/root/etc/motd
-- recipes/suse-SLE12-JeOS/config.xml
-- recipes/suse-SLE12-JeOS/config.sh
-- recipes/suse-SLE12-JeOS/Dicefile
-- recipes/suse-13.1-JeOS/Vagrantfile
-- recipes/suse-13.1-JeOS/root/etc/motd
-- recipes/suse-13.1-JeOS/config.xml
-- recipes/suse-13.1-JeOS/config.sh
-- recipes/suse-13.1-JeOS/Dicefile
- COPYING
homepage: https://github.com/schaefi/dice/
licenses:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.1-JeOS/Dicefile
new/recipes/suse-13.1-JeOS/Dicefile
--- old/recipes/suse-13.1-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100
+++ new/recipes/suse-13.1-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Dice.configure do |config|
- config.ssh_user = "vagrant"
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.1-JeOS/Vagrantfile
new/recipes/suse-13.1-JeOS/Vagrantfile
--- old/recipes/suse-13.1-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.1-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000
+0100
@@ -1,25 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- if ENV["VAGRANT_DEFAULT_PROVIDER"] == "virtualbox"
- # VirtualBox
- config.vm.define :jeos_13_1_build do |jeos_13_1_build|
- jeos_13_1_build.vm.box = "kiwi-build-box"
- jeos_13_1_build.vm.provider :virtualbox do |vb|
- vb.customize ["modifyvm", :id, "--memory", "2048"]
- end
- end
- else
- # docker
- config.vm.provider "docker" do |d|
- # select a docker image from the list, you need to have imported
- # Virtualization:Appliances:Images/docker-box-13.1
- # cat kiwi-docker-image.tar.xz | docker import - kiwi-build-box:new
- d.image = "kiwi-build-box:new"
- d.create_args = ["--privileged=true", "-i", "-t"]
- # start the sshd in foreground to keep the container in running state
- d.cmd = ["/usr/sbin/sshd", "-D"]
- d.has_ssh = true
- end
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.1-JeOS/config.sh
new/recipes/suse-13.1-JeOS/config.sh
--- old/recipes/suse-13.1-JeOS/config.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.1-JeOS/config.sh 1970-01-01 01:00:00.000000000
+0100
@@ -1,84 +0,0 @@
-#!/bin/bash
-#================
-# FILE : config.sh
-#----------------
-# PROJECT : OpenSuSE KIWI Image System
-# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
-# :
-# AUTHOR : Marcus Schaefer <m...@suse.de>
-# :
-# BELONGS TO : Operating System images
-# :
-# DESCRIPTION : configuration script for SUSE based
-# : operating systems
-# :
-# :
-# STATUS : BETA
-#----------------
-#======================================
-# Functions...
-#--------------------------------------
-test -f /.kconfig && . /.kconfig
-test -f /.profile && . /.profile
-
-#======================================
-# Greeting...
-#--------------------------------------
-echo "Configure image: [$kiwi_iname]..."
-
-#======================================
-# Mount system filesystems
-#--------------------------------------
-baseMount
-
-#======================================
-# Setup baseproduct link
-#--------------------------------------
-suseSetupProduct
-
-#======================================
-# Add missing gpg keys to rpm
-#--------------------------------------
-suseImportBuildKey
-
-#======================================
-# Activate services
-#--------------------------------------
-suseInsertService sshd
-
-#======================================
-# Setup default target, multi-user
-#--------------------------------------
-baseSetRunlevel 3
-
-#==========================================
-# remove package docs
-#------------------------------------------
-rm -rf /usr/share/doc/packages/*
-rm -rf /usr/share/doc/manual/*
-rm -rf /opt/kde*
-
-#======================================
-# only basic version of vim is
-# installed; no syntax highlighting
-#--------------------------------------
-sed -i -e's/^syntax on/" syntax on/' /etc/vimrc
-
-#======================================
-# SuSEconfig
-#--------------------------------------
-suseConfig
-
-#======================================
-# Add 13.1 repo
-#--------------------------------------
-baseRepo="http://download.opensuse.org/distribution/13.1/repo/oss";
-baseName="suse-13.1"
-zypper ar $baseRepo $baseName
-
-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.1-JeOS/config.xml
new/recipes/suse-13.1-JeOS/config.xml
--- old/recipes/suse-13.1-JeOS/config.xml 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.1-JeOS/config.xml 1970-01-01 01:00:00.000000000
+0100
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<image schemaversion="6.1" name="LimeJeOS-openSUSE-13.1">
- <description type="system">
- <author>Marcus Schäfer</author>
- <contact>m...@novell.com</contact>
- <specification>
- openSUSE 13.1 JeOS, is a small text based image
- </specification>
- </description>
- <profiles>
- <profile name="xenFlavour" description="VMX with Xen kernel"/>
- <profile name="ec2Flavour" description="VMX with EC2/Xen kernel"/>
- <profile name="vmxFlavour" description="VMX with default kernel"
import="true"/>
- </profiles>
- <preferences>
- <type image="iso" boot="isoboot/suse-13.1" flags="overlay"
hybrid="true" firmware="efi"/>
- <version>1.13.1</version>
- <packagemanager>zypper</packagemanager>
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- <rpm-excludedocs>true</rpm-excludedocs>
- <bootsplash-theme>openSUSE</bootsplash-theme>
- <bootloader-theme>openSUSE</bootloader-theme>
- </preferences>
- <preferences profiles="ec2Flavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.1"
bootprofile="ec2" bootkernel="ec2k" bootloader="grub"
kernelcmdline="xencons=xvc0 console=xvc0 multipath=off splash=silent showopts"/>
- </preferences>
- <preferences profiles="xenFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.1"
bootprofile="xen" bootkernel="xenk" bootloader="grub2">
- <machine memory="512" domain="domU">
- <vmdisk id="0" device="/dev/xvda" controller="ide"/>
- <vmnic interface=""/>
- </machine>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-13.1"
bootprofile="xen" bootkernel="xenk" installiso="true" bootloader="grub2">
- <oemconfig>
- <oem-systemsize>2048</oem-systemsize>
- <oem-swap>true</oem-swap>
- </oemconfig>
- <machine domain="dom0">
- <vmdisk id="0" controller="ide"/>
- </machine>
- </type>
- </preferences>
- <preferences profiles="vmxFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.1"
format="vmdk" bootloader="grub2" primary="true">
- <machine memory="512" guestOS="suse" HWversion="4">
- <vmdisk id="0" controller="ide"/>
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- </machine>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-13.1"
installiso="true" bootloader="grub2">
- <oemconfig>
- <oem-systemsize>2048</oem-systemsize>
- <oem-swap>true</oem-swap>
- </oemconfig>
- <machine memory="512" guestOS="suse" HWversion="4">
- <vmdisk id="0" controller="ide"/>
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- </machine>
- </type>
- </preferences>
- <users group="root">
- <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root"
name="root"/>
- </users>
- <repository type="yast2" alias="suse-13.1">
- <source path="obs://13.1/repo/oss"/>
- </repository>
- <repository type="rpm-md" alias="suse-13.1-update">
- <source path="obs://openSUSE:13.1:Update/standard"/>
- </repository>
- <packages type="image">
- <namedCollection name="base"/>
- <product name="openSUSE"/>
- <package name="plymouth-branding-openSUSE" bootinclude="true"/>
- <package name="grub2-branding-openSUSE" bootinclude="true"/>
- <package name="ifplugd"/>
- <package name="iputils"/>
- <package name="vim"/>
- <package name="grub2"/>
- <package name="syslinux"/>
- <package name="lvm2"/>
- <package name="plymouth"/>
- <package name="fontconfig"/>
- <package name="fonts-config"/>
- <package name="tar"/>
- <package name="parted"/>
- <package name="autoyast2"/>
- </packages>
- <packages type="iso">
- <package name="gfxboot-branding-openSUSE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="oem">
- <package name="gfxboot-branding-openSUSE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="image" profiles="ec2Flavour">
- <package name="kernel-ec2" replaces="kernel-default"/>
- <package name="kernel-ec2" replaces="kernel-xen"/>
- <package name="xen-tools" arch="x86_64" replaces=""/>
- <package name="xen" arch="x86_64" replaces=""/>
- </packages>
- <packages type="image" profiles="xenFlavour">
- <package name="kernel-xen" replaces="kernel-default"/>
- <package name="kernel-xen" replaces="kernel-ec2"/>
- <package name="xen-tools" arch="x86_64" replaces=""/>
- <package name="xen" arch="x86_64" replaces=""/>
- </packages>
- <packages type="image" profiles="vmxFlavour">
- <package name="kernel-default" replaces="kernel-xen"/>
- <package name="kernel-default" replaces="kernel-ec2"/>
- <package name="kernel-default" replaces="xen-tools"/>
- <package name="kernel-default" replaces="xen"/>
- </packages>
- <packages type="bootstrap">
- <package name="udev"/>
- <package name="filesystem"/>
- <package name="glibc-locale"/>
- <package name="cracklib-dict-full"/>
- <package name="ca-certificates"/>
- <package name="module-init-tools"/>
- </packages>
- <packages type="delete">
- <package name="kernel-debug"/>
- </packages>
-</image>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.1-JeOS/root/etc/motd
new/recipes/suse-13.1-JeOS/root/etc/motd
--- old/recipes/suse-13.1-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.1-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-This is the Lime-JeOS 13.1 SuSE Linux System.
-To upgrade your system call:
-
- zypper refresh
- zypper install -t product openSUSE-13.1
-
-Have a lot of fun...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.2-JeOS/Dicefile
new/recipes/suse-13.2-JeOS/Dicefile
--- old/recipes/suse-13.2-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100
+++ new/recipes/suse-13.2-JeOS/Dicefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Dice.configure do |config|
- config.buildhost = "130.211.71.73"
- config.ssh_user = "vagrant"
- config.ssh_private_key = File.join(ENV["HOME"], ".dice/key/vagrant")
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.2-JeOS/config.sh
new/recipes/suse-13.2-JeOS/config.sh
--- old/recipes/suse-13.2-JeOS/config.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.2-JeOS/config.sh 1970-01-01 01:00:00.000000000
+0100
@@ -1,89 +0,0 @@
-#!/bin/bash
-#================
-# FILE : config.sh
-#----------------
-# PROJECT : OpenSuSE KIWI Image System
-# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
-# :
-# AUTHOR : Marcus Schaefer <m...@suse.de>
-# :
-# BELONGS TO : Operating System images
-# :
-# DESCRIPTION : configuration script for SUSE based
-# : operating systems
-# :
-# :
-# STATUS : BETA
-#----------------
-#======================================
-# Functions...
-#--------------------------------------
-test -f /.kconfig && . /.kconfig
-test -f /.profile && . /.profile
-
-#======================================
-# Greeting...
-#--------------------------------------
-echo "Configure image: [$kiwi_iname]..."
-
-#======================================
-# Mount system filesystems
-#--------------------------------------
-baseMount
-
-#======================================
-# Setup baseproduct link
-#--------------------------------------
-suseSetupProduct
-
-#======================================
-# Add missing gpg keys to rpm
-#--------------------------------------
-suseImportBuildKey
-
-#======================================
-# Activate services
-#--------------------------------------
-suseInsertService sshd
-
-#======================================
-# Setup default target, multi-user
-#--------------------------------------
-baseSetRunlevel 3
-
-#==========================================
-# remove package docs
-#------------------------------------------
-rm -rf /usr/share/doc/packages/*
-rm -rf /usr/share/doc/manual/*
-rm -rf /opt/kde*
-
-#======================================
-# only basic version of vim is
-# installed; no syntax highlighting
-#--------------------------------------
-sed -i -e's/^syntax on/" syntax on/' /etc/vimrc
-
-#======================================
-# SuSEconfig
-#--------------------------------------
-suseConfig
-
-#======================================
-# Add 13.2 repo
-#--------------------------------------
-baseRepo="http://download.opensuse.org/distribution/13.2/repo/oss";
-baseName="suse-13.2"
-zypper ar $baseRepo $baseName
-
-#======================================
-# Remove yast if not in use
-#--------------------------------------
-suseRemoveYaST
-
-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.2-JeOS/config.xml
new/recipes/suse-13.2-JeOS/config.xml
--- old/recipes/suse-13.2-JeOS/config.xml 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.2-JeOS/config.xml 1970-01-01 01:00:00.000000000
+0100
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<image schemaversion="6.1" name="LimeJeOS-openSUSE-13.2">
- <description type="system">
- <author>Marcus Schäfer</author>
- <contact>m...@novell.com</contact>
- <specification>
- openSUSE 13.2 JeOS, is a small text based image
- </specification>
- </description>
- <profiles>
- <profile name="xenFlavour" description="VMX with Xen kernel"/>
- <profile name="ec2Flavour" description="VMX with EC2/Xen kernel"/>
- <profile name="vmxFlavour" description="VMX with default kernel"
import="true"/>
- </profiles>
- <preferences>
- <type image="iso" boot="isoboot/suse-13.2" flags="overlay"
hybrid="true" firmware="efi" kernelcmdline="splash"/>
- <version>1.13.2</version>
- <packagemanager>zypper</packagemanager>
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- <rpm-excludedocs>true</rpm-excludedocs>
- <bootsplash-theme>openSUSE</bootsplash-theme>
- <bootloader-theme>openSUSE</bootloader-theme>
- </preferences>
- <preferences profiles="ec2Flavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.2"
bootprofile="ec2" bootkernel="ec2k" bootloader="grub2"
kernelcmdline="xencons=xvc0 console=xvc0 multipath=off splash" firmware="ec2"/>
- </preferences>
- <preferences profiles="xenFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.2"
bootprofile="xen" bootkernel="xenk" bootloader="grub2" kernelcmdline="splash">
- <machine memory="512" domain="domU">
- <vmdisk id="0" device="/dev/xvda" controller="ide"/>
- <vmnic interface=""/>
- </machine>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-13.2"
bootprofile="xen" bootkernel="xenk" installiso="true" bootloader="grub2"
kernelcmdline="splash">
- <oemconfig>
- <oem-systemsize>2048</oem-systemsize>
- <oem-swap>true</oem-swap>
- </oemconfig>
- <machine domain="dom0">
- <vmdisk id="0" controller="ide"/>
- </machine>
- </type>
- </preferences>
- <preferences profiles="vmxFlavour">
- <type image="vmx" primary="true" filesystem="btrfs"
boot="vmxboot/suse-13.2" format="vmdk" bootloader="grub2"
kernelcmdline="splash" bootpartition="false">
- <size unit="G">3</size>
- <systemdisk name="systemVG"/>
- <machine memory="512" guestOS="suse" HWversion="4">
- <vmdisk id="0" controller="ide"/>
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- </machine>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-13.2"
installiso="true" bootloader="grub2" kernelcmdline="splash">
- <oemconfig>
- <oem-systemsize>2048</oem-systemsize>
- <oem-swap>true</oem-swap>
- </oemconfig>
- <machine memory="512" guestOS="suse" HWversion="4">
- <vmdisk id="0" controller="ide"/>
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- </machine>
- </type>
- </preferences>
- <users group="root">
- <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root"
name="root"/>
- </users>
- <repository type="yast2">
- <source path="obs://13.2/repo/oss"/>
- </repository>
- <repository type="rpm-md">
- <source path="obs://openSUSE:13.2:Update/standard"/>
- </repository>
- <packages type="image">
-<!--
- new pattern system seems still not functional in 13.2
-
- <namedCollection name="base"/>
-
- using pattern package directly instead
--->
- <package name="patterns-openSUSE-base"/>
- <package name="plymouth-branding-openSUSE" bootinclude="true"/>
- <package name="grub2-branding-openSUSE" bootinclude="true"/>
- <package name="ifplugd"/>
- <package name="iputils"/>
- <package name="vim"/>
- <package name="grub2"/>
- <package name="syslinux"/>
- <package name="lvm2"/>
- <package name="plymouth"/>
- <package name="fontconfig"/>
- <package name="fonts-config"/>
- <package name="tar"/>
- <package name="parted"/>
- <package name="kiwi"/>
- <package name="kiwi-templates"/>
- <package name="kiwi-desc-oemboot"/>
- <package name="kiwi-desc-isoboot"/>
- <package name="kiwi-desc-vmxboot"/>
- <package name="kiwi-desc-netboot"/>
- <package name="openssh"/>
- </packages>
- <packages type="iso">
- <package name="gfxboot-branding-openSUSE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="oem">
- <package name="gfxboot-branding-openSUSE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="image" profiles="ec2Flavour">
- <package name="kernel-ec2" replaces="kernel-default"/>
- <package name="kernel-ec2" replaces="kernel-xen"/>
- <package name="xen-tools" arch="x86_64" replaces=""/>
- <package name="xen" arch="x86_64" replaces=""/>
- </packages>
- <packages type="image" profiles="xenFlavour">
- <package name="kernel-xen" replaces="kernel-default"/>
- <package name="kernel-xen" replaces="kernel-ec2"/>
- <package name="xen-tools" arch="x86_64" replaces=""/>
- <package name="xen" arch="x86_64" replaces=""/>
- </packages>
- <packages type="image" profiles="vmxFlavour">
- <package name="kernel-default" replaces="kernel-xen"/>
- <package name="kernel-default" replaces="kernel-ec2"/>
- <package name="kernel-default" replaces="xen-tools"/>
- <package name="kernel-default" replaces="xen"/>
- </packages>
- <packages type="bootstrap">
- <package name="udev"/>
- <package name="filesystem"/>
- <package name="glibc-locale"/>
- <package name="cracklib-dict-full"/>
- <package name="ca-certificates"/>
-<!--
- The installation of products in SLE12 requires the SLE12 zypper
- Thus the following definition only works when building on SLE12
-
- <product name="openSUSE"/>
-
- In order to stay compatible we just install the product rpm
- package. It's required to install the release package in the
- bootstrap phase in order to avoid the installation of an auto
- selected dummy-release package which later conflicts with all
- other release packages
--->
- <package name="openSUSE-release"/>
- </packages>
- <packages type="delete">
- <package name="kernel-debug"/>
- </packages>
-</image>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-13.2-JeOS/root/etc/motd
new/recipes/suse-13.2-JeOS/root/etc/motd
--- old/recipes/suse-13.2-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-13.2-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-This is the Lime-JeOS 13.2 SuSE Linux System.
-To upgrade your system call:
-
- zypper refresh
- zypper install -t product openSUSE-13.2
-
-Have a lot of fun...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-SLE12-JeOS/Dicefile
new/recipes/suse-SLE12-JeOS/Dicefile
--- old/recipes/suse-SLE12-JeOS/Dicefile 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-SLE12-JeOS/Dicefile 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-Dice.configure do |config|
- config.ssh_user = "vagrant"
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-SLE12-JeOS/Vagrantfile
new/recipes/suse-SLE12-JeOS/Vagrantfile
--- old/recipes/suse-SLE12-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-SLE12-JeOS/Vagrantfile 1970-01-01 01:00:00.000000000
+0100
@@ -1,24 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-# set provider to use
-ENV["VAGRANT_DEFAULT_PROVIDER"] = "libvirt"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.define :jeos_sle12_build do |jeos_sle12_build|
- jeos_sle12_build.vm.box = "kiwi-build-box"
-
- if ENV["VAGRANT_DEFAULT_PROVIDER"] == "libvirt"
- # LibVirt
- jeos_sle12_build.vm.provider :libvirt do |domain|
- domain.memory = 2048
- domain.cpus = 1
- domain.nested = true
- end
- else
- # VirtualBox
- jeos_sle12_build.vm.provider :virtualbox do |vb|
- vb.customize ["modifyvm", :id, "--memory", "1024"]
- end
- end
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-SLE12-JeOS/config.sh
new/recipes/suse-SLE12-JeOS/config.sh
--- old/recipes/suse-SLE12-JeOS/config.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-SLE12-JeOS/config.sh 1970-01-01 01:00:00.000000000
+0100
@@ -1,82 +0,0 @@
-#!/bin/bash
-#================
-# FILE : config.sh
-#----------------
-# PROJECT : OpenSuSE KIWI Image System
-# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
-# :
-# AUTHOR : Marcus Schaefer <m...@suse.de>
-# :
-# BELONGS TO : Operating System images
-# :
-# DESCRIPTION : configuration script for SUSE based
-# : operating systems
-# :
-# :
-# STATUS : BETA
-#----------------
-#======================================
-# Functions...
-#--------------------------------------
-test -f /.kconfig && . /.kconfig
-test -f /.profile && . /.profile
-
-#======================================
-# Greeting...
-#--------------------------------------
-echo "Configure image: [$kiwi_iname]..."
-
-#======================================
-# Mount system filesystems
-#--------------------------------------
-baseMount
-
-#======================================
-# Setup baseproduct link
-#--------------------------------------
-suseSetupProduct
-
-#======================================
-# Add missing gpg keys to rpm
-#--------------------------------------
-suseImportBuildKey
-
-#======================================
-# Activate services
-#--------------------------------------
-suseInsertService sshd
-
-#======================================
-# Setup default target, multi-user
-#--------------------------------------
-baseSetRunlevel 3
-
-#==========================================
-# remove package docs
-#------------------------------------------
-rm -rf /usr/share/doc/packages/*
-rm -rf /usr/share/doc/manual/*
-rm -rf /opt/kde*
-
-#======================================
-# only basic version of vim is
-# installed; no syntax highlighting
-#--------------------------------------
-sed -i -e's/^syntax on/" syntax on/' /etc/vimrc
-
-#======================================
-# SuSEconfig
-#--------------------------------------
-suseConfig
-
-#======================================
-# Remove yast if not in use
-#--------------------------------------
-suseRemoveYaST
-
-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-SLE12-JeOS/config.xml
new/recipes/suse-SLE12-JeOS/config.xml
--- old/recipes/suse-SLE12-JeOS/config.xml 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-SLE12-JeOS/config.xml 1970-01-01 01:00:00.000000000
+0100
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<image schemaversion="6.1" name="LimeJeOS-SLE12">
- <description type="system">
- <author>Marcus Schäfer</author>
- <contact>m...@novell.com</contact>
- <specification>SUSE Linux Enterprise 12 JeOS</specification>
- </description>
- <profiles>
- <profile name="xenFlavour" description="VMX with Xen kernel"/>
- <profile name="ec2Flavour" description="VMX with EC2/Xen kernel"/>
- <profile name="vmxFlavour" description="VMX with default kernel"
import="true"/>
- </profiles>
- <preferences>
- <type image="iso" boot="isoboot/suse-SLES12" flags="overlay"
hybrid="true" firmware="efi" kernelcmdline="splash"/>
- <version>1.13.1</version>
- <packagemanager>zypper</packagemanager>
- <bootsplash-theme>SLE</bootsplash-theme>
- <bootloader-theme>SLE</bootloader-theme>
- <locale>en_US</locale>
- <keytable>us.map.gz</keytable>
- <timezone>Europe/Berlin</timezone>
- <hwclock>utc</hwclock>
- <rpm-excludedocs>true</rpm-excludedocs>
- </preferences>
- <preferences profiles="ec2Flavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12"
bootprofile="ec2" bootkernel="ec2k" bootloader="grub2"
kernelcmdline="xencons=xvc0 console=xvc0 multipath=off splash" firmware="ec2"/>
- </preferences>
- <preferences profiles="xenFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12"
bootprofile="xen" bootkernel="xenk" bootloader="grub2" kernelcmdline="splash">
- <machine memory="512" domain="domU">
- <vmdisk id="0" device="/dev/xvda" controller="ide"/>
- <vmnic interface=""/>
- </machine>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12"
bootprofile="xen" bootkernel="xenk" installiso="true" bootloader="grub2"
kernelcmdline="splash">
- <oemconfig>
- <oem-systemsize>2048</oem-systemsize>
- <oem-swap>true</oem-swap>
- </oemconfig>
- <machine domain="dom0">
- <vmdisk id="0" controller="ide"/>
- </machine>
- </type>
- </preferences>
- <preferences profiles="vmxFlavour">
- <type image="vmx" primary="true" filesystem="ext3"
boot="vmxboot/suse-SLES12" format="vmdk" bootloader="grub2" firmware="efi"
kernelcmdline="splash" bootpartition="false">
- <systemdisk name="systemVG"/>
- <machine memory="512" guestOS="suse" HWversion="4">
- <vmdisk id="0" controller="ide"/>
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- </machine>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12"
installiso="true" bootloader="grub2" firmware="efi" hybrid="true"
kernelcmdline="splash">
- <oemconfig>
- <oem-systemsize>2048</oem-systemsize>
- <oem-swap>true</oem-swap>
- </oemconfig>
- <machine memory="512" guestOS="suse" HWversion="4">
- <vmdisk id="0" controller="ide"/>
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- </machine>
- </type>
- </preferences>
- <users group="root">
- <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root"
name="root"/>
- </users>
- <repository type="rpm-md">
- <source path="http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/"/>
- </repository>
- <packages type="image">
-<!-- new pattern system requires build system with libsolv >= 0.6.5 -->
-<!-- therefore solve patterns as package to let it work in 13.1 -->
- <package name="patterns-sles-Minimal"/>
- <package name="plymouth-branding-SLE" bootinclude="true"/>
- <package name="grub2-branding-SLE" bootinclude="true"/>
- <package name="iputils"/>
- <package name="vim"/>
- <package name="grub2"/>
- <package name="syslinux"/>
- <package name="lvm2"/>
- <package name="plymouth"/>
- <package name="fontconfig"/>
- <package name="fonts-config"/>
- <package name="tar"/>
- <package name="parted"/>
- <package name="systemd"/>
- <package name="systemd-sysvinit"/>
- <package name="dracut"/>
- <package name="wicked"/>
- <package name="iproute2"/>
- <package name="kiwi"/>
- <package name="kiwi-templates"/>
- <package name="kiwi-desc-oemboot"/>
- <package name="kiwi-desc-isoboot"/>
- <package name="kiwi-desc-vmxboot"/>
- <package name="kiwi-desc-netboot"/>
- <package name="openssh"/>
- </packages>
- <packages type="iso">
- <package name="gfxboot-branding-SLE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="image" profiles="ec2Flavour">
- <package name="kernel-ec2" replaces="kernel-default"/>
- <package name="kernel-ec2" replaces="kernel-xen"/>
- <package name="xen-tools" arch="x86_64" replaces=""/>
- <package name="xen" arch="x86_64" replaces=""/>
- </packages>
- <packages type="image" profiles="xenFlavour">
- <package name="kernel-xen" replaces="kernel-default"/>
- <package name="kernel-xen" replaces="kernel-ec2"/>
- <package name="xen-tools" arch="x86_64" replaces=""/>
- <package name="xen" arch="x86_64" replaces=""/>
- <package name="gfxboot-branding-SLE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="image" profiles="vmxFlavour">
- <package name="kernel-default" replaces="kernel-xen"/>
- <package name="kernel-default" replaces="kernel-ec2"/>
- <package name="kernel-default" replaces="xen-tools"/>
- <package name="kernel-default" replaces="xen"/>
- <package name="gfxboot-branding-SLE" bootinclude="true"
bootdelete="true"/>
- </packages>
- <packages type="bootstrap">
- <package name="udev"/>
- <package name="filesystem"/>
- <package name="glibc-locale"/>
- <package name="cracklib-dict-full"/>
- <package name="ca-certificates"/>
-<!--
- The installation of products in SLE12 requires the SLE12 zypper
- Thus the following definition only works when building on SLE12
-
- <product name="SLES"/>
-
- In order to stay compatible we just install the product rpm
- package. It's required to install the release package in the
- bootstrap phase in order to avoid the installation of an auto
- selected dummy-release package which later conflicts with all
- other release packages
--->
- <package name="sles-release"/>
- </packages>
- <packages type="delete">
- <package name="kernel-debug"/>
- </packages>
-</image>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/recipes/suse-SLE12-JeOS/root/etc/motd
new/recipes/suse-SLE12-JeOS/root/etc/motd
--- old/recipes/suse-SLE12-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000
+0100
+++ new/recipes/suse-SLE12-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000
+0100
@@ -1,8 +0,0 @@
-This is the Lime-JeOS SLE12 Linux System.
-To upgrade your system call:
-
- zypper addrepo <SLE-Source> suse-SLE12
- zypper refresh
- zypper install -t product <product-name>
-
-Have a lot of fun...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0
new/recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0
--- old/recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0
1970-01-01 01:00:00.000000000 +0100
+++ new/recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-BOOTPROTO='dhcp'
-MTU=''
-REMOTE_IPADDR=''
-STARTMODE='onboot'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/recipes/suse-SLE12-JeOS/root/etc/udev/rules.d/70-persistent-net.rules
new/recipes/suse-SLE12-JeOS/root/etc/udev/rules.d/70-persistent-net.rules
--- old/recipes/suse-SLE12-JeOS/root/etc/udev/rules.d/70-persistent-net.rules
1970-01-01 01:00:00.000000000 +0100
+++ new/recipes/suse-SLE12-JeOS/root/etc/udev/rules.d/70-persistent-net.rules
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="?*",
ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="?*", NAME="lan0"
