From aa3a76eb9d79d97fecb00c0ec8af2c3bfaaa5cf3 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 19 Dec 2013 11:36:34 +0100 Subject: [PATCH 01/12] Init: Change-Id: Ib09fd9d489ac231baf9fd691db0a6640da86f579 Signed-off-by: Philippe Coval --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 -- 2.7.4 From c959650fe60861e3ef89c1adbebefd1c8d36215d Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 19 Dec 2013 12:14:46 +0100 Subject: [PATCH 02/12] - init project. Change-Id: I0e06d334c6a79582a104ed41300692376fc98878 Signed-off-by: Ronan Le Martret --- Makefile | 49 +++++++++++++++++++++++++++++++ VERSION | 1 + generic-repos.yaml | 20 +++++++++++++ generic.yaml | 56 +++++++++++++++++++++++++++++++++++ ks/generic-mbr-i586.yaml | 9 ++++++ packaging/meta-generic.changes | 0 packaging/meta-generic.spec | 32 ++++++++++++++++++++ partitions/README.generic | 3 ++ partitions/generic-mbr | 1 + patterns/generic-adaptation.yaml | 10 +++++++ patterns/generic-applications.yaml | 7 +++++ patterns/generic-middleware.yaml | 60 ++++++++++++++++++++++++++++++++++++++ patterns/generic-packaging.yaml | 6 ++++ patterns/generic-qa.yaml | 16 ++++++++++ scripts/base-general.post | 6 ++++ scripts/base-ivi-minimal.post | 3 ++ scripts/base-weston-default.post | 49 +++++++++++++++++++++++++++++++ scripts/buildname.nochroot | 5 ++++ scripts/efi.post | 3 ++ scripts/optimization.post | 2 ++ scripts/rpm.post | 3 ++ scripts/vconf-keys-default.post | 2 ++ scripts/wrt-widgets.post | 6 ++++ 23 files changed, 349 insertions(+) create mode 100644 Makefile create mode 100644 VERSION create mode 100644 generic-repos.yaml create mode 100644 generic.yaml create mode 100644 ks/generic-mbr-i586.yaml create mode 100644 packaging/meta-generic.changes create mode 100644 packaging/meta-generic.spec create mode 100644 partitions/README.generic create mode 100644 partitions/generic-mbr create mode 100644 patterns/generic-adaptation.yaml create mode 100644 patterns/generic-applications.yaml create mode 100644 patterns/generic-middleware.yaml create mode 100644 patterns/generic-packaging.yaml create mode 100644 patterns/generic-qa.yaml create mode 100644 scripts/base-general.post create mode 100644 scripts/base-ivi-minimal.post create mode 100644 scripts/base-weston-default.post create mode 100644 scripts/buildname.nochroot create mode 100644 scripts/efi.post create mode 100644 scripts/optimization.post create mode 100644 scripts/rpm.post create mode 100644 scripts/vconf-keys-default.post create mode 100644 scripts/wrt-widgets.post diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9720056 --- /dev/null +++ b/Makefile @@ -0,0 +1,49 @@ +# ex: set tabstop=4 noexpandtab: +VERSION = $(shell cat VERSION) +NAME=meta-generic +TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/") +DESTDIR= +ARCH=i586 + +ifeq ($(VERSION), $(TAGVER)) + TAG = $(TAGVER) +else + TAG = "HEAD" +endif + +all: + +install: + install -d ${DESTDIR}/usr/share/package-groups/generic + install -d ${DESTDIR}/usr/share/image-configurations/generic/configs + install -d ${DESTDIR}/usr/share/image-configurations/generic/scripts + install -d ${DESTDIR}/usr/share/image-configurations/generic/partitions + install -m 644 patterns/*.yaml ${DESTDIR}/usr/share/package-groups/generic + install -m 644 generic.yaml ${DESTDIR}/usr/share/image-configurations/generic + install -m 644 generic-repos.yaml ${DESTDIR}/usr/share/image-configurations/generic + install -m 644 ks/*.yaml ${DESTDIR}/usr/share/image-configurations/generic/configs + install -D partitions/* ${DESTDIR}/usr/share/image-configurations/generic/partitions + install -D scripts/* ${DESTDIR}/usr/share/image-configurations/generic/scripts + +test: + kickstarter -c generic.yaml -r generic-repos.yaml -e ks/ +tag: + git tag -a $(VERSION) -m "$(VERSION)" + git push --tags + +changelog: + python ./scripts/gitlog2changelog.py + + +dist-bz2: + git archive --format=tar --prefix=$(NAME)-$(VERSION)/ $(TAG) | \ + bzip2 > $(NAME)-$(VERSION).tar.bz2 + +dist-gz: + git archive --format=tar --prefix=$(NAME)-$(VERSION)/ $(TAG) | \ + gzip > $(NAME)-$(VERSION).tar.gz + +dist: dist-bz2 + +clean: + rm -rf patterns.xml INDEX.xml group.xml *.xml diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..5325a8d --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +001 diff --git a/generic-repos.yaml b/generic-repos.yaml new file mode 100644 index 0000000..537cfeb --- /dev/null +++ b/generic-repos.yaml @@ -0,0 +1,20 @@ +Repositories: + - Name: generic + Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-wayland/ + Options: --ssl_verify=no + + - Name: generic-wayland_i586 + Url: http://download.tizen.org/live/Tizen:/Generic/ia32-wayland/ + Options: --ssl_verify=no + + - Name: generic-wayland_x86_64 + Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-wayland/ + Options: --ssl_verify=no + + - Name: generic-x11_i586 + Url: http://download.tizen.org/live/Tizen:/Generic/ia32-x11/ + Options: --ssl_verify=no + + - Name: generic-x11_x86_64 + Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-x11/ + Options: --ssl_verify=no \ No newline at end of file diff --git a/generic.yaml b/generic.yaml new file mode 100644 index 0000000..210e108 --- /dev/null +++ b/generic.yaml @@ -0,0 +1,56 @@ +Default: + Baseline: tizen-3.0 + Active: True + Mic2Options: -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap + Architecture: ia32 + Part: generic-mbr + Language: en_US.UTF-8 + Keyboard: us + Timezone: America/Los_Angeles + RootPass: tizen + DefaultUser: tizen + DefaultUserPass: tizen + BootLoader: True + BootloaderAppend: "rootwait rootfstype=ext4 quiet rw vga=current" + BootloaderTimeout: 3 + BootloaderOptions: '--ptable=gpt --menus="install:Wipe and Install:systemd.unit=system-installer.service:test"' + StartX: False + Desktop: None + Repos: + - Generic + SaveRepos: False + UserGroups: "audio,video" + Groups: + - Base System + - Generic Packaging + - Generic Adaptation + PostScripts: + - base-general + - rpm + - base-weston-default + - wrt-widgets.post + - vconf-keys-default + NoChrootScripts: + - buildname + +Wayland-i586: + Part: generic-mbr + UserGroups: "audio,video,weston-launch" + Groups: + - Generic Middleware + - Wayland + - Console Tools + - Generic Applications + PostScripts: + - optimization + +Wayland-x86_64: + Part: generic-mbr + UserGroups: "audio,video,weston-launch" + Groups: + - Generic Middleware + - Wayland + - Console Tools + - Generic Applications + PostScripts: + - optimization \ No newline at end of file diff --git a/ks/generic-mbr-i586.yaml b/ks/generic-mbr-i586.yaml new file mode 100644 index 0000000..0a8f3fe --- /dev/null +++ b/ks/generic-mbr-i586.yaml @@ -0,0 +1,9 @@ +Name: Generic MBR 86_x64 +Schedule: "*" +Active: True +Platform: Wayland-i586 +Part: generic-mbr +FileName: generic-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_x86_64 diff --git a/packaging/meta-generic.changes b/packaging/meta-generic.changes new file mode 100644 index 0000000..e69de29 diff --git a/packaging/meta-generic.spec b/packaging/meta-generic.spec new file mode 100644 index 0000000..e10c6f2 --- /dev/null +++ b/packaging/meta-generic.spec @@ -0,0 +1,32 @@ +%define profile generic + +Summary: Generic Meta Data +Name: meta-generic +Version: 001 +Release: 1 +BuildArch: noarch +License: GPL-2.0 +Group: Base/Configuration +URL: http://www.tizen.org +Source: %{name}-%{version}.tar.bz2 + +%description +Generic Meta Data. +Includes patterns and image configurations for Generic images. + +%prep +%setup -q + +%build +make + +%install +%make_install + + +%files +%attr(644,-,-) %{_datadir}/package-groups/%{profile}/*.yaml +%{_datadir}/image-configurations/%{profile}/*.yaml +%{_datadir}/image-configurations/%{profile}/configs/*.yaml +%{_datadir}/image-configurations/%{profile}/partitions +%{_datadir}/image-configurations/%{profile}/scripts diff --git a/partitions/README.generic b/partitions/README.generic new file mode 100644 index 0000000..c708236 --- /dev/null +++ b/partitions/README.generic @@ -0,0 +1,3 @@ +generic-mbr partition file is for images using "legacy" mbr partitioning scheme. + +These files are referenced in the respective image ks files to set the partitioning accordingly diff --git a/partitions/generic-mbr b/partitions/generic-mbr new file mode 100644 index 0000000..1a5d132 --- /dev/null +++ b/partitions/generic-mbr @@ -0,0 +1 @@ +part / --fstype="ext4" --ondisk=sda --size=6144 --active --label tizen-pc-genericdev \ No newline at end of file diff --git a/patterns/generic-adaptation.yaml b/patterns/generic-adaptation.yaml new file mode 100644 index 0000000..413db24 --- /dev/null +++ b/patterns/generic-adaptation.yaml @@ -0,0 +1,10 @@ +Description: Generic Adaptation +Name: generic-adaptation +Packages: +- desktop-skin +- linux-firmware +- xf86-input-synaptics +- xf86-video-intel +- xf86-input-keyboard +- wrt-widgets +Summary: Generic Adaptation diff --git a/patterns/generic-applications.yaml b/patterns/generic-applications.yaml new file mode 100644 index 0000000..fac54d4 --- /dev/null +++ b/patterns/generic-applications.yaml @@ -0,0 +1,7 @@ +Description: Generic Applications +Name: generic-applications +Packages: +- ca-certificates +- ca-certificates-mozilla +- webkit2-efl-test +Summary: Generic Applications diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml new file mode 100644 index 0000000..b587d63 --- /dev/null +++ b/patterns/generic-middleware.yaml @@ -0,0 +1,60 @@ +Description: Generic Middleware +Name: generic-middleware +Packages: +- alsa-utils +- alsa-plugins-pulse +- bluez +- bluetooth-agent +- bluetooth-frwk +- bluetooth-share +- bluetooth-tools-no-firmware +- calendar-service +- csr-framework +- default-ac-domains +- econnman +- elm-misc +- emotion +- efl-theme-tizen-hd +- evolution-data-server +- gdb-server +- gpg2 +- gst-libav +- gst-plugins-bad +- gst-plugins-base +- gst-plugins-good +- gstreamer +- gstreamer-vaapi +- iptables +- libprivilege-control-conf +- libva-intel-driver +- media-data-sdk +- neard +- neardal +- net-config +- obexd +- ofono +- pam-locale +- pkgmgr-server +- prelink +- pulseaudio +- pulseaudio-config +- pulseaudio-locale +- pulseaudio-module-bluetooth +- pulseaudio-utils +- rfkill +- tree +- vaapi-tools +- wpa_supplicant +- web-ui-fw +- web-ui-fw-demo-tizen-winsets +- web-ui-fw-theme-default +- web-ui-fw-theme-tizen-black +- web-ui-fw-theme-tizen-white +- wrt +- wrt-commons +- wrt-installer +- wrt-installer-preinstall-service +- wrt-plugins-tizen +- wrt-security +- zypper +Summary: Generic Middleware diff --git a/patterns/generic-packaging.yaml b/patterns/generic-packaging.yaml new file mode 100644 index 0000000..a32efa8 --- /dev/null +++ b/patterns/generic-packaging.yaml @@ -0,0 +1,6 @@ +Description: Generic Packaging +Name: generic-packaging +Packages: +- gpg2 +- zypper +Summary: Generic Packaging diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml new file mode 100644 index 0000000..ee7594f --- /dev/null +++ b/patterns/generic-qa.yaml @@ -0,0 +1,16 @@ +Description: Generic QA Tools +Name: generic-qa +Packages: +- bluez-test +- connman-test +- dbus-python +- dlogutil +- eet-tools +- gdb +- gstreamer-utils +- neard-test +- ofono-test +- python-xml +- wget +- zypper +Summary: Generic QA Tools diff --git a/scripts/base-general.post b/scripts/base-general.post new file mode 100644 index 0000000..e944197 --- /dev/null +++ b/scripts/base-general.post @@ -0,0 +1,6 @@ +# base-general.post + +ln -sf /proc/self/mounts /etc/mtab + +rm -rf /root/.zypp + diff --git a/scripts/base-ivi-minimal.post b/scripts/base-ivi-minimal.post new file mode 100644 index 0000000..33f28c2 --- /dev/null +++ b/scripts/base-ivi-minimal.post @@ -0,0 +1,3 @@ +# base-ivi-minimal.post +rm /usr/lib/systemd/system/default.target +ln -sf multi-user.target /usr/lib/systemd/system/default.target diff --git a/scripts/base-weston-default.post b/scripts/base-weston-default.post new file mode 100644 index 0000000..310e1f2 --- /dev/null +++ b/scripts/base-weston-default.post @@ -0,0 +1,49 @@ +# Initialize the native application database +pkg_initdb + +# Add 'app' user to the weston-launch group +/usr/sbin/groupmod -A app weston-launch + +# Temporary work around for bug in filesystem package resulting in the 'app' user home +# directory being only readable by root +chown -R app:app /opt/home/app + +# Since weston-launch runs with the "User" label, the app +# home dir must have the same label +chsmack -a User /opt/home/app + +# base-weston-default.post +mkdir -p /usr/lib/systemd/system/graphical.target.wants +ln -sf weston.target /usr/lib/systemd/user/default.target + +# Enable user@5000.service by setting the linger for user 'app' +mkdir -p /var/lib/systemd/linger +touch /var/lib/systemd/linger/app + +# Add over-riding environment to enable the web runtime to +# run on an IVI image as a different user then the tizen user +# Some notes on some of the variables: +# - ELM_THEME is needed in order for the wrt to have visible content +# - WRT_PROCESS_POOL_DISABLE is a work around for TIVI-2062 +cat > /etc/sysconfig/wrt < /etc/udev/rules.d/99-dri.rules </usr/lib/udev/rules.d/99-tty.rules <> $INSTALL_ROOT/etc/tizen-release + echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release +fi diff --git a/scripts/efi.post b/scripts/efi.post new file mode 100644 index 0000000..00df656 --- /dev/null +++ b/scripts/efi.post @@ -0,0 +1,3 @@ +# efi.post +/usr/sbin/setup-efi-ivi + diff --git a/scripts/optimization.post b/scripts/optimization.post new file mode 100644 index 0000000..ed08671 --- /dev/null +++ b/scripts/optimization.post @@ -0,0 +1,2 @@ +# Run prelink to speed up dynamic binary/library loading +/usr/sbin/prelink --all diff --git a/scripts/rpm.post b/scripts/rpm.post new file mode 100644 index 0000000..be1ddcf --- /dev/null +++ b/scripts/rpm.post @@ -0,0 +1,3 @@ +# rpm.post +rm -f /var/lib/rpm/__db* +rpmdb --rebuilddb diff --git a/scripts/vconf-keys-default.post b/scripts/vconf-keys-default.post new file mode 100644 index 0000000..a79a7a7 --- /dev/null +++ b/scripts/vconf-keys-default.post @@ -0,0 +1,2 @@ +# Needed to fix TIVI-1629 +vconftool set -t int -f db/setting/default_memory/wap 0 diff --git a/scripts/wrt-widgets.post b/scripts/wrt-widgets.post new file mode 100644 index 0000000..58e8ded --- /dev/null +++ b/scripts/wrt-widgets.post @@ -0,0 +1,6 @@ +######################################## START WRT WIDGETS PREINSTALL #################### + +prepare_widgets.sh +install_widgets.sh + +######################################## END WRT WIDGETS PREINSTALL #################### -- 2.7.4 From fc1b7a0992330b35f5b78b97c2b06cf64fa03c94 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 10 Jan 2014 18:49:02 +0100 Subject: [PATCH 03/12] adjust scripts, patterns and config for generic-[x11,wayland]-[i586,x86_64] Change-Id: I66cf0b359885bf2ce6e35e66697bfb6ae237b3ca Signed-off-by: Stephane Desneux --- generic-repos.yaml | 6 +-- generic.yaml | 37 +++++++++-------- ks/generic-wayland-mbr-i586.yaml | 9 ++++ ...r-i586.yaml => generic-wayland-mbr-x86_64.yaml} | 6 +-- ks/generic-x11-mbr-i586.yaml | 9 ++++ ks/generic-x11-mbr-x86_64.yaml | 9 ++++ partitions/generic-mbr | 2 +- patterns/generic-adaptation.yaml | 8 ++-- patterns/generic-applications.yaml | 2 +- patterns/generic-middleware.yaml | 3 ++ patterns/generic-wayland.yaml | 11 +++++ patterns/generic-x11.yaml | 8 ++++ scripts/base-general.post | 2 +- ...-ivi-minimal.post => base-generic-minimal.post} | 3 +- scripts/base-weston-default.post | 27 ++++++++++-- scripts/base-x11-default.post | 5 +++ scripts/buildname.nochroot | 7 ++-- scripts/customize.post | 48 ++++++++++++++++++++++ scripts/efi.post | 3 -- scripts/optimization.post | 2 + scripts/rpm.post | 3 +- scripts/vconf-keys-default.post | 2 + scripts/wrt-widgets.post | 5 ++- 23 files changed, 171 insertions(+), 46 deletions(-) create mode 100644 ks/generic-wayland-mbr-i586.yaml rename ks/{generic-mbr-i586.yaml => generic-wayland-mbr-x86_64.yaml} (55%) create mode 100644 ks/generic-x11-mbr-i586.yaml create mode 100644 ks/generic-x11-mbr-x86_64.yaml create mode 100644 patterns/generic-wayland.yaml create mode 100644 patterns/generic-x11.yaml rename scripts/{base-ivi-minimal.post => base-generic-minimal.post} (62%) create mode 100644 scripts/base-x11-default.post create mode 100644 scripts/customize.post delete mode 100644 scripts/efi.post diff --git a/generic-repos.yaml b/generic-repos.yaml index 537cfeb..cbc8bf3 100644 --- a/generic-repos.yaml +++ b/generic-repos.yaml @@ -1,8 +1,4 @@ Repositories: - - Name: generic - Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-wayland/ - Options: --ssl_verify=no - - Name: generic-wayland_i586 Url: http://download.tizen.org/live/Tizen:/Generic/ia32-wayland/ Options: --ssl_verify=no @@ -17,4 +13,4 @@ Repositories: - Name: generic-x11_x86_64 Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-x11/ - Options: --ssl_verify=no \ No newline at end of file + Options: --ssl_verify=no diff --git a/generic.yaml b/generic.yaml index 210e108..bf1d72c 100644 --- a/generic.yaml +++ b/generic.yaml @@ -2,7 +2,6 @@ Default: Baseline: tizen-3.0 Active: True Mic2Options: -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap - Architecture: ia32 Part: generic-mbr Language: en_US.UTF-8 Keyboard: us @@ -11,9 +10,9 @@ Default: DefaultUser: tizen DefaultUserPass: tizen BootLoader: True - BootloaderAppend: "rootwait rootfstype=ext4 quiet rw vga=current" + BootloaderAppend: "rw vga=current splash rootwait rootfstype=ext4 plymouth.enable=0" BootloaderTimeout: 3 - BootloaderOptions: '--ptable=gpt --menus="install:Wipe and Install:systemd.unit=system-installer.service:test"' + BootloaderOptions: '--ptable=gpt --menus="install:Wipe and Install:systemd.unit=system-installer.service:test"' StartX: False Desktop: None Repos: @@ -22,35 +21,41 @@ Default: UserGroups: "audio,video" Groups: - Base System + - Console Tools - Generic Packaging - - Generic Adaptation PostScripts: - base-general - rpm - - base-weston-default - - wrt-widgets.post - - vconf-keys-default + - optimization + - customize NoChrootScripts: - buildname -Wayland-i586: +Minimal: + Part: generic-mbr + +Wayland: Part: generic-mbr UserGroups: "audio,video,weston-launch" Groups: + - Generic Wayland + - Generic Adaptation - Generic Middleware - - Wayland - - Console Tools - Generic Applications PostScripts: - - optimization + - base-weston-default + - wrt-widgets + - vconf-keys-default -Wayland-x86_64: +X11: Part: generic-mbr - UserGroups: "audio,video,weston-launch" Groups: + - Generic X11 + - Generic Adaptation - Generic Middleware - - Wayland - - Console Tools - Generic Applications PostScripts: - - optimization \ No newline at end of file + - base-x11-default + - wrt-widgets + - vconf-keys-default + diff --git a/ks/generic-wayland-mbr-i586.yaml b/ks/generic-wayland-mbr-i586.yaml new file mode 100644 index 0000000..b914080 --- /dev/null +++ b/ks/generic-wayland-mbr-i586.yaml @@ -0,0 +1,9 @@ +Name: Generic Wayland MBR i586 +Schedule: "*" +Active: True +Platform: Wayland +Part: generic-mbr +FileName: generic-wayland-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_i586 diff --git a/ks/generic-mbr-i586.yaml b/ks/generic-wayland-mbr-x86_64.yaml similarity index 55% rename from ks/generic-mbr-i586.yaml rename to ks/generic-wayland-mbr-x86_64.yaml index 0a8f3fe..cd07a08 100644 --- a/ks/generic-mbr-i586.yaml +++ b/ks/generic-wayland-mbr-x86_64.yaml @@ -1,9 +1,9 @@ -Name: Generic MBR 86_x64 +Name: Generic Wayland MBR x86_64 Schedule: "*" Active: True -Platform: Wayland-i586 +Platform: Wayland Part: generic-mbr -FileName: generic-mbr-i586 +FileName: generic-wayland-mbr-x86_64 Kernel: kernel-x86-generic Repos: - generic-wayland_x86_64 diff --git a/ks/generic-x11-mbr-i586.yaml b/ks/generic-x11-mbr-i586.yaml new file mode 100644 index 0000000..2ae7dc4 --- /dev/null +++ b/ks/generic-x11-mbr-i586.yaml @@ -0,0 +1,9 @@ +Name: Generic X11 MBR i586 +Schedule: "*" +Active: True +Platform: X11 +Part: generic-mbr +FileName: generic-x11-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-x11_i586 diff --git a/ks/generic-x11-mbr-x86_64.yaml b/ks/generic-x11-mbr-x86_64.yaml new file mode 100644 index 0000000..30e7ac8 --- /dev/null +++ b/ks/generic-x11-mbr-x86_64.yaml @@ -0,0 +1,9 @@ +Name: Generic X11 MBR x86_64 +Schedule: "*" +Active: True +Platform: X11 +Part: generic-mbr +FileName: generic-x11-mbr-x86_64 +Kernel: kernel-x86-generic +Repos: + - generic-x11_x86_64 diff --git a/partitions/generic-mbr b/partitions/generic-mbr index 1a5d132..5b79934 100644 --- a/partitions/generic-mbr +++ b/partitions/generic-mbr @@ -1 +1 @@ -part / --fstype="ext4" --ondisk=sda --size=6144 --active --label tizen-pc-genericdev \ No newline at end of file +part / --fstype="ext4" --ondisk=sda --size=6144 --active --label tizen-generic diff --git a/patterns/generic-adaptation.yaml b/patterns/generic-adaptation.yaml index 413db24..0e30bc0 100644 --- a/patterns/generic-adaptation.yaml +++ b/patterns/generic-adaptation.yaml @@ -1,10 +1,8 @@ Description: Generic Adaptation Name: generic-adaptation Packages: -- desktop-skin - linux-firmware -- xf86-input-synaptics -- xf86-video-intel -- xf86-input-keyboard -- wrt-widgets +- kernel-x86-generic +- dlogutil +- system-installer Summary: Generic Adaptation diff --git a/patterns/generic-applications.yaml b/patterns/generic-applications.yaml index fac54d4..89fd479 100644 --- a/patterns/generic-applications.yaml +++ b/patterns/generic-applications.yaml @@ -1,7 +1,7 @@ Description: Generic Applications Name: generic-applications Packages: +- ail - ca-certificates -- ca-certificates-mozilla - webkit2-efl-test Summary: Generic Applications diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index b587d63..6663f00 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -24,6 +24,7 @@ Packages: - gst-plugins-good - gstreamer - gstreamer-vaapi +- gstreamer-utils - iptables - libprivilege-control-conf - libva-intel-driver @@ -42,6 +43,7 @@ Packages: - pulseaudio-module-bluetooth - pulseaudio-utils - rfkill +- sqlite3 - tree - vaapi-tools - wpa_supplicant @@ -56,5 +58,6 @@ Packages: - wrt-installer-preinstall-service - wrt-plugins-tizen - wrt-security +- wrt-widgets - zypper Summary: Generic Middleware diff --git a/patterns/generic-wayland.yaml b/patterns/generic-wayland.yaml new file mode 100644 index 0000000..09bae5a --- /dev/null +++ b/patterns/generic-wayland.yaml @@ -0,0 +1,11 @@ +Description: Generic Wayland +Name: generic-wayland +Packages: +- cantarell-fonts +- dejavu-fonts +- weston +- xkeyboard-config +- tizen-branding-default +- user-session-units +- desktop-skin +Summary: Generic Wayland diff --git a/patterns/generic-x11.yaml b/patterns/generic-x11.yaml new file mode 100644 index 0000000..5b722a6 --- /dev/null +++ b/patterns/generic-x11.yaml @@ -0,0 +1,8 @@ +Description: Generic X11 +Name: generic-x11 +Packages: +- xorg-server +- xf86-input-synaptics +- xf86-video-intel +- xf86-input-keyboard +Summary: Generic X11 diff --git a/scripts/base-general.post b/scripts/base-general.post index e944197..5a74bad 100644 --- a/scripts/base-general.post +++ b/scripts/base-general.post @@ -1,4 +1,4 @@ -# base-general.post +################ base-general.post ################## ln -sf /proc/self/mounts /etc/mtab diff --git a/scripts/base-ivi-minimal.post b/scripts/base-generic-minimal.post similarity index 62% rename from scripts/base-ivi-minimal.post rename to scripts/base-generic-minimal.post index 33f28c2..65e09eb 100644 --- a/scripts/base-ivi-minimal.post +++ b/scripts/base-generic-minimal.post @@ -1,3 +1,4 @@ -# base-ivi-minimal.post +################### base-generic-minimal.post ################# + rm /usr/lib/systemd/system/default.target ln -sf multi-user.target /usr/lib/systemd/system/default.target diff --git a/scripts/base-weston-default.post b/scripts/base-weston-default.post index 310e1f2..12e5ef5 100644 --- a/scripts/base-weston-default.post +++ b/scripts/base-weston-default.post @@ -1,3 +1,6 @@ +#################### base-weston-default.post ################## +# to be synced with profile/ivi/meta-ivi/scripts/base-weston-default.post + # Initialize the native application database pkg_initdb @@ -12,13 +15,15 @@ chown -R app:app /opt/home/app # home dir must have the same label chsmack -a User /opt/home/app -# base-weston-default.post +# Enable a logind session for 'app' user on seat0 (the default seat for +# graphical sessions) mkdir -p /usr/lib/systemd/system/graphical.target.wants +ln -s ../user-session-launch@.service /usr/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5000.service ln -sf weston.target /usr/lib/systemd/user/default.target # Enable user@5000.service by setting the linger for user 'app' -mkdir -p /var/lib/systemd/linger -touch /var/lib/systemd/linger/app +#mkdir -p /var/lib/systemd/linger +#touch /var/lib/systemd/linger/app # Add over-riding environment to enable the web runtime to # run on an IVI image as a different user then the tizen user @@ -37,13 +42,27 @@ EOF # Use the same over-rides for the native prelaunch daemon cp /etc/sysconfig/wrt /etc/sysconfig/launchpad +# sdx: for AMD (ac.service) +#cp /etc/sysconfig/wrt /etc/sysconfig/prelaunch + # Add a rule to ensure the app user has permissions to # open the graphics device cat > /etc/udev/rules.d/99-dri.rules </etc/profile.d/user-dbus.sh <<'EOF' +export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/dbus/user_bus_socket +EOF + # sdx: user 'app' must own /dev/tty1 for weston to start correctly cat >/usr/lib/udev/rules.d/99-tty.rules <>/etc/ssh/sshd_config +echo "AddressFamily inet" >>/etc/ssh/sshd_config diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot index 36ae504..b248084 100644 --- a/scripts/buildname.nochroot +++ b/scripts/buildname.nochroot @@ -1,5 +1,6 @@ -# buildname.nochroot +####################### buildname.nochroot ####################### if [ -n "$IMG_NAME" ]; then - echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release - echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release + echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release + echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release + echo "$IMG_NAME @BUILD_ID@" >>$INSTALL_ROOT/etc/tizen-snapshot fi diff --git a/scripts/customize.post b/scripts/customize.post new file mode 100644 index 0000000..66745c1 --- /dev/null +++ b/scripts/customize.post @@ -0,0 +1,48 @@ +##################### customize.post #################### + +# customize bash prompt +cat >/etc/profile.d/bash_prompt_custom.sh <<'EOF' +if [ "$PS1" ]; then + + function parse_git_branch { + [ -x "/usr/bin/git" ] && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' + } + + function proml { + # set a fancy prompt (overwrite the one in /etc/profile) + local default="\[\e[0m\]" + local usercol='\[\e[1;34m\]' # blue + local hostcol='\[\e[1;32m\]' # green + local pathcol='\[\e[1;33m\]' # yellow + local gitcol='\[\e[1;31m\]' # light red + local termcmd='' + local _p="$"; + + if [ "`id -u`" -eq 0 ]; then + usercol='\[\e[1;31m\]' + _p="#" + fi + + PS1="${usercol}\u${default}@${hostcol}\h${default}:${pathcol}\w${default}${gitcol}\$(parse_git_branch)${default}${_p} ${termcmd}" + } + + proml + + function rcd () { + [ "${1:0:1}" == "/" ] && { cd $1; } || { cd $(pwd -P)/$1; } + } + + alias ll="ls -lZ" + alias lr="ls -ltrZ" + alias la="ls -alZ" + + function dbus_find () { + echo export $(tr '\0' '\n' Date: Fri, 17 Jan 2014 09:41:40 +0100 Subject: [PATCH 04/12] cosmetic changes on scripts Change-Id: I7e18400e0d33437abb2acfdcf1ad1ab327047237 Signed-off-by: Stephane Desneux --- scripts/base-weston-default.post | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/base-weston-default.post b/scripts/base-weston-default.post index 12e5ef5..73f0768 100644 --- a/scripts/base-weston-default.post +++ b/scripts/base-weston-default.post @@ -1,6 +1,4 @@ #################### base-weston-default.post ################## -# to be synced with profile/ivi/meta-ivi/scripts/base-weston-default.post - # Initialize the native application database pkg_initdb @@ -26,7 +24,7 @@ ln -sf weston.target /usr/lib/systemd/user/default.target #touch /var/lib/systemd/linger/app # Add over-riding environment to enable the web runtime to -# run on an IVI image as a different user then the tizen user +# run as a different user than the tizen user # Some notes on some of the variables: # - ELM_THEME is needed in order for the wrt to have visible content # - WRT_PROCESS_POOL_DISABLE is a work around for TIVI-2062 -- 2.7.4 From 5820c4cf14f9bf3efa70957a444f3e01f5ac06da Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 17 Jan 2014 14:50:04 +0100 Subject: [PATCH 05/12] - set repo url to the official url. Change-Id: I850da1e01ed053487e8fec14b84971b064a00d31 Signed-off-by: Ronan Le Martret --- generic-repos.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generic-repos.yaml b/generic-repos.yaml index cbc8bf3..c603180 100644 --- a/generic-repos.yaml +++ b/generic-repos.yaml @@ -1,16 +1,16 @@ Repositories: - Name: generic-wayland_i586 - Url: http://download.tizen.org/live/Tizen:/Generic/ia32-wayland/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-wayland-ia32/latest/ Options: --ssl_verify=no - Name: generic-wayland_x86_64 - Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-wayland/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-wayland-x86_64/latest/ Options: --ssl_verify=no - Name: generic-x11_i586 - Url: http://download.tizen.org/live/Tizen:/Generic/ia32-x11/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-x11-ia32/latest/ Options: --ssl_verify=no - Name: generic-x11_x86_64 - Url: http://download.tizen.org/live/Tizen:/Generic/x86_64-x11/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-x11-x86_64/latest/ Options: --ssl_verify=no -- 2.7.4 From c6dd998d21724fb967dc1b3977f093a7026e3e27 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 16 Jan 2014 17:45:51 +0100 Subject: [PATCH 06/12] added ELM theme definition inside weston (updated /etc/profile.d/weston.sh) Change-Id: I935ea01ee7f89f6753e7e7750ac994e72ebc4133 Signed-off-by: Stephane Desneux --- scripts/base-weston-default.post | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/base-weston-default.post b/scripts/base-weston-default.post index 73f0768..4facb35 100644 --- a/scripts/base-weston-default.post +++ b/scripts/base-weston-default.post @@ -51,6 +51,12 @@ EOF ############ +# sdx: add ELM theme in weston.sh +cat >>/etc/profile.d/weston.sh <<'EOF' +# sdx: patch commfrom meta-generic/scripts/base-weston-default.post +export ELM_THEME=tizen-HD-light +EOF + # sdx: set DBUS env inside weston shell (login shell) cat >/etc/profile.d/user-dbus.sh <<'EOF' export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/dbus/user_bus_socket -- 2.7.4 From 8bb72fcd2e915e25c87f944a9b832010ce1ffe45 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 22 Jan 2014 16:49:33 +0100 Subject: [PATCH 07/12] - Change repos URL. Change-Id: If86e3fb468a1b19e3c4970f9f93ce7c4c13af09a Signed-off-by: Ronan Le Martret --- generic-repos.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generic-repos.yaml b/generic-repos.yaml index c603180..3de3fb4 100644 --- a/generic-repos.yaml +++ b/generic-repos.yaml @@ -1,16 +1,16 @@ Repositories: - Name: generic-wayland_i586 - Url: http://download.tizen.org/snapshots/tizen/generic/generic-wayland-ia32/latest/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-wayland-ia32/@BUILD_ID@/repos/generic/@ARCH@/packages/ Options: --ssl_verify=no - Name: generic-wayland_x86_64 - Url: http://download.tizen.org/snapshots/tizen/generic/generic-wayland-x86_64/latest/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-wayland-x86_64/@BUILD_ID@/repos/generic/@ARCH@/packages/ Options: --ssl_verify=no - Name: generic-x11_i586 - Url: http://download.tizen.org/snapshots/tizen/generic/generic-x11-ia32/latest/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-x11-ia32/@BUILD_ID@/repos/generic/@ARCH@/packages/ Options: --ssl_verify=no - Name: generic-x11_x86_64 - Url: http://download.tizen.org/snapshots/tizen/generic/generic-x11-x86_64/latest/ + Url: http://download.tizen.org/snapshots/tizen/generic/generic-x11-x86_64/@BUILD_ID@/repos/generic/@ARCH@/packages/ Options: --ssl_verify=no -- 2.7.4 From 1e7cee906244ecfd14084b60f50fd78cfe3ee482 Mon Sep 17 00:00:00 2001 From: JF Ding Date: Tue, 28 Jan 2014 10:22:49 +0800 Subject: [PATCH 08/12] Added architecture definination for all ks This is necessary, and this will be recorded in the final image-configs.xml file. Change-Id: I408bb5d277af90fa6e388a89d75dfef1ad215af0 Signed-off-by: JF Ding --- generic.yaml | 1 + ks/generic-wayland-mbr-x86_64.yaml | 1 + ks/generic-x11-mbr-x86_64.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/generic.yaml b/generic.yaml index bf1d72c..f202d49 100644 --- a/generic.yaml +++ b/generic.yaml @@ -1,6 +1,7 @@ Default: Baseline: tizen-3.0 Active: True + Architecture: ia32 Mic2Options: -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap Part: generic-mbr Language: en_US.UTF-8 diff --git a/ks/generic-wayland-mbr-x86_64.yaml b/ks/generic-wayland-mbr-x86_64.yaml index cd07a08..4131173 100644 --- a/ks/generic-wayland-mbr-x86_64.yaml +++ b/ks/generic-wayland-mbr-x86_64.yaml @@ -1,4 +1,5 @@ Name: Generic Wayland MBR x86_64 +Architecture: x86_64 Schedule: "*" Active: True Platform: Wayland diff --git a/ks/generic-x11-mbr-x86_64.yaml b/ks/generic-x11-mbr-x86_64.yaml index 30e7ac8..62fb1d7 100644 --- a/ks/generic-x11-mbr-x86_64.yaml +++ b/ks/generic-x11-mbr-x86_64.yaml @@ -1,4 +1,5 @@ Name: Generic X11 MBR x86_64 +Architecture: x86_64 Schedule: "*" Active: True Platform: X11 -- 2.7.4 From 1a2126edf49b5736229657756495fffcfd27c13a Mon Sep 17 00:00:00 2001 From: Corentin Lecouvey Date: Mon, 3 Feb 2014 11:32:59 +0100 Subject: [PATCH 09/12] Add model-config-generic package in Generic images This is needed to use system-info API. Change-Id: Ia8442e4115dbd5bb30cc3647e397edafe38eb794 Signed-off-by: Corentin Lecouvey --- patterns/generic-middleware.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/patterns/generic-middleware.yaml b/patterns/generic-middleware.yaml index 6663f00..ea367ea 100644 --- a/patterns/generic-middleware.yaml +++ b/patterns/generic-middleware.yaml @@ -29,6 +29,7 @@ Packages: - libprivilege-control-conf - libva-intel-driver - media-data-sdk +- model-config-generic - neard - neardal - net-config -- 2.7.4 From aba618b7992ba7287b0fc3fcf94e69492d473110 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 28 Jan 2014 19:15:29 +0100 Subject: [PATCH 10/12] patterns/generic-qa: added testkit-lite, python-request and eat-device in package group Change-Id: I318f842e9c0bb2772e7197a142184309dc1a608c Signed-off-by: Stephane Desneux --- patterns/generic-qa.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml index ee7594f..6c7f4bc 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/generic-qa.yaml @@ -13,4 +13,7 @@ Packages: - python-xml - wget - zypper +- eat-device +- python-requests +- testkit-lite Summary: Generic QA Tools -- 2.7.4 From fe14ce8e19a139713aa445891bc273f38167e8d2 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Mon, 10 Feb 2014 18:46:29 +0100 Subject: [PATCH 11/12] added automated QA images, patterns and scripts Change-Id: I2fb03a6a273ee2e475d15f9d67544d01f314078a Signed-off-by: Stephane Desneux --- generic.yaml | 36 ++++++++++++++++++++++++++++ ks/generic-qa-unsafe-wayland-mbr-i586.yaml | 9 +++++++ ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml | 10 ++++++++ ks/generic-qa-unsafe-x11-mbr-i586.yaml | 9 +++++++ ks/generic-qa-unsafe-x11-mbr-x86_64.yaml | 10 ++++++++ patterns/generic-autoqa.yaml | 5 ++++ patterns/generic-qa.yaml | 3 --- scripts/autoqa.post | 27 +++++++++++++++++++++ 8 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 ks/generic-qa-unsafe-wayland-mbr-i586.yaml create mode 100644 ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml create mode 100644 ks/generic-qa-unsafe-x11-mbr-i586.yaml create mode 100644 ks/generic-qa-unsafe-x11-mbr-x86_64.yaml create mode 100644 patterns/generic-autoqa.yaml create mode 100644 scripts/autoqa.post diff --git a/generic.yaml b/generic.yaml index f202d49..7622340 100644 --- a/generic.yaml +++ b/generic.yaml @@ -35,6 +35,13 @@ Default: Minimal: Part: generic-mbr +Minimal_QA: + Part: generic-mbr + Groups: + - Generic Automated QA Tools + PostScripts: + - autoqa + Wayland: Part: generic-mbr UserGroups: "audio,video,weston-launch" @@ -48,6 +55,21 @@ Wayland: - wrt-widgets - vconf-keys-default +Wayland_QA: + Part: generic-mbr + UserGroups: "audio,video,weston-launch" + Groups: + - Generic Wayland + - Generic Adaptation + - Generic Middleware + - Generic Applications + - Generic Automated QA Tools + PostScripts: + - base-weston-default + - wrt-widgets + - vconf-keys-default + - autoqa + X11: Part: generic-mbr Groups: @@ -60,3 +82,17 @@ X11: - wrt-widgets - vconf-keys-default +X11_QA: + Part: generic-mbr + Groups: + - Generic X11 + - Generic Adaptation + - Generic Middleware + - Generic Applications + - Generic Automated QA Tools + PostScripts: + - base-x11-default + - wrt-widgets + - vconf-keys-default + - autoqa + diff --git a/ks/generic-qa-unsafe-wayland-mbr-i586.yaml b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml new file mode 100644 index 0000000..6a143d6 --- /dev/null +++ b/ks/generic-qa-unsafe-wayland-mbr-i586.yaml @@ -0,0 +1,9 @@ +Name: Generic QA Unsafe Wayland MBR i586 +Schedule: "*" +Active: True +Platform: Wayland_QA +Part: generic-mbr +FileName: generic-qa-unsafe-wayland-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_i586 diff --git a/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml b/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml new file mode 100644 index 0000000..cc821d1 --- /dev/null +++ b/ks/generic-qa-unsafe-wayland-mbr-x86_64.yaml @@ -0,0 +1,10 @@ +Name: Generic QA Unsafe Wayland MBR x86_64 +Architecture: x86_64 +Schedule: "*" +Active: True +Platform: Wayland_QA +Part: generic-mbr +FileName: generic-qa-unsafe-wayland-mbr-x86_64 +Kernel: kernel-x86-generic +Repos: + - generic-wayland_x86_64 diff --git a/ks/generic-qa-unsafe-x11-mbr-i586.yaml b/ks/generic-qa-unsafe-x11-mbr-i586.yaml new file mode 100644 index 0000000..77d1bdc --- /dev/null +++ b/ks/generic-qa-unsafe-x11-mbr-i586.yaml @@ -0,0 +1,9 @@ +Name: Generic QA Unsafe X11 MBR i586 +Schedule: "*" +Active: True +Platform: X11_QA +Part: generic-mbr +FileName: generic-qa-unsafe-x11-mbr-i586 +Kernel: kernel-x86-generic +Repos: + - generic-x11_i586 diff --git a/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml b/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml new file mode 100644 index 0000000..c140742 --- /dev/null +++ b/ks/generic-qa-unsafe-x11-mbr-x86_64.yaml @@ -0,0 +1,10 @@ +Name: Generic QA Unsafe X11 MBR x86_64 +Architecture: x86_64 +Schedule: "*" +Active: True +Platform: X11_QA +Part: generic-mbr +FileName: generic-qa-unsafe-x11-mbr-x86_64 +Kernel: kernel-x86-generic +Repos: + - generic-x11_x86_64 diff --git a/patterns/generic-autoqa.yaml b/patterns/generic-autoqa.yaml new file mode 100644 index 0000000..713aa3a --- /dev/null +++ b/patterns/generic-autoqa.yaml @@ -0,0 +1,5 @@ +Description: Generic Automated QA Tools +Name: generic-autoqa +Packages: +- testkit-lite +Summary: Generic Automated QA Tools diff --git a/patterns/generic-qa.yaml b/patterns/generic-qa.yaml index 6c7f4bc..ee7594f 100644 --- a/patterns/generic-qa.yaml +++ b/patterns/generic-qa.yaml @@ -13,7 +13,4 @@ Packages: - python-xml - wget - zypper -- eat-device -- python-requests -- testkit-lite Summary: Generic QA Tools diff --git a/scripts/autoqa.post b/scripts/autoqa.post new file mode 100644 index 0000000..5a461e6 --- /dev/null +++ b/scripts/autoqa.post @@ -0,0 +1,27 @@ +##################### autoqa.post ####################### + +# generate private/public key for autologin as root + +# the private key: use the following key on the ssh client side (copied here for reference) +cat </root/.ssh/id_eat_dsa +-----BEGIN DSA PRIVATE KEY----- +MIIBugIBAAKBgQCE/Ulli3iKf8IwKVacoGCDyZhuabZ+h2oBSd/xlURZa/p3EQVg +9cFXcyYcjDvKqDu/OZ82l1L33ytZQ1D7Ag/4WOTdUZImQiQakntE6tMLeEtkiXBd +l4s9QQY8BrHcuoB4fZoLlbs2Jqbz+e2HDlUD+rKmzba/5d70Ze9YmFyDRQIVANH/ +yWdBBWXrFRexL6DIBTwFATM3AoGAcTiEj7Ai18KkajMW/TeiTWA+O3ZeBCFHLPGx +tSyQKkJ0EUJfTSg9ixn4XfLW61JuY/pkhRDMwCbAto1ymy11hqWKRadpxAmu4czQ +vWYUSERiS/28xGjKrazWjpM0sSmqZ+Tgezc1FWfCWAfHHpEg0YcttnOvJTB8hj6V +d84WHKoCgYAw/uP6bE7xxCWUqAtQKob2P/xkXPPWKZ2nAWCxgnYVimGuXc+jThOo +UBhkIpD+fdMtbRHdLtbzOLohUgaZokgEi58+pjJAJU/tW4Lvzw0nBfReG5OTvfuu +CLchiFnppSDLi8u4Q4URorg4WFudXrGvUBwvHSGJYNczj7e3XJissAIUTPS6vh9U +pp1kboovuWeQFduOSOU= +-----END DSA PRIVATE KEY----- +EOF + +# the public key +cat </root/.ssh/id_eat_dsa.pub +ssh-dss AAAAB3NzaC1kc3MAAACBAIT9SWWLeIp/wjApVpygYIPJmG5ptn6HagFJ3/GVRFlr+ncRBWD1wVdzJhyMO8qoO785nzaXUvffK1lDUPsCD/hY5N1RkiZCJBqSe0Tq0wt4S2SJcF2Xiz1BBjwGsdy6gHh9mguVuzYmpvP57YcOVQP6sqbNtr/l3vRl71iYXINFAAAAFQDR/8lnQQVl6xUXsS+gyAU8BQEzNwAAAIBxOISPsCLXwqRqMxb9N6JNYD47dl4EIUcs8bG1LJAqQnQRQl9NKD2LGfhd8tbrUm5j+mSFEMzAJsC2jXKbLXWGpYpFp2nECa7hzNC9ZhRIRGJL/bzEaMqtrNaOkzSxKapn5OB7NzUVZ8JYB8cekSDRhy22c68lMHyGPpV3zhYcqgAAAIAw/uP6bE7xxCWUqAtQKob2P/xkXPPWKZ2nAWCxgnYVimGuXc+jThOoUBhkIpD+fdMtbRHdLtbzOLohUgaZokgEi58+pjJAJU/tW4Lvzw0nBfReG5OTvfuuCLchiFnppSDLi8u4Q4URorg4WFudXrGvUBwvHSGJYNczj7e3XJissA== meego@testCtrlPC +EOF + +# public key is authorized to login (automatically) +cat /root/.ssh/id_eat_dsa.pub >>/root/.ssh/authorized_keys -- 2.7.4 From f8345337a251ab980cf95540ec17ad7c4df82e30 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 12 Feb 2014 12:28:23 +0100 Subject: [PATCH 12/12] added packages to automated QA pattern Change-Id: Iae528486ecabbe4bac78a2bd7266eeca72005599 Signed-off-by: Stephane Desneux --- patterns/generic-autoqa.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patterns/generic-autoqa.yaml b/patterns/generic-autoqa.yaml index 713aa3a..9b04aed 100644 --- a/patterns/generic-autoqa.yaml +++ b/patterns/generic-autoqa.yaml @@ -2,4 +2,6 @@ Description: Generic Automated QA Tools Name: generic-autoqa Packages: - testkit-lite +- screen +- which Summary: Generic Automated QA Tools -- 2.7.4