From 5c897c95a1bb446110fa182d5a0a548b62844d1c Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Wed, 5 Jun 2013 13:57:22 -0700 Subject: [PATCH] Get package into correct format and add ivi-adaptation pattern --- Makefile | 25 +++++++------- base-repos.yaml => ivi-repos.yaml | 0 base.yaml => ivi.yaml | 6 +++- ks/{wayland-i586.yaml => ivi-wayland-i586.yaml} | 8 +++-- packaging/meta-ivi.changes | 3 ++ packaging/meta-ivi.spec | 18 +++++----- partitions/{README.part => README.ivi} | 0 partitions/{base => ivi} | 0 patterns/applications.yaml | 5 +++ patterns/base-desktop.yaml | 22 +++++++++++++ patterns/base.yaml | 32 ++++++++++++++++++ patterns/benchmarks.yaml | 23 +++++++++++++ patterns/console-tools.yaml | 25 ++++++++++++++ patterns/development.yaml | 44 +++++++++++++++++++++++++ patterns/enlightenment.yaml | 9 +++++ patterns/ivi-adaptation.yaml | 12 +++++++ patterns/wayland.yaml | 10 ++++++ 17 files changed, 218 insertions(+), 24 deletions(-) rename base-repos.yaml => ivi-repos.yaml (100%) rename base.yaml => ivi.yaml (83%) rename ks/{wayland-i586.yaml => ivi-wayland-i586.yaml} (72%) rename partitions/{README.part => README.ivi} (100%) rename partitions/{base => ivi} (100%) create mode 100644 patterns/applications.yaml create mode 100644 patterns/base-desktop.yaml create mode 100644 patterns/base.yaml create mode 100644 patterns/benchmarks.yaml create mode 100644 patterns/console-tools.yaml create mode 100644 patterns/development.yaml create mode 100644 patterns/enlightenment.yaml create mode 100644 patterns/ivi-adaptation.yaml create mode 100644 patterns/wayland.yaml diff --git a/Makefile b/Makefile index d0e706b..af1500a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # ex: set tabstop=4 noexpandtab: VERSION = $(shell cat VERSION) -NAME=meta-base +NAME=meta-pc TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/") DESTDIR= ARCH=i586 @@ -14,20 +14,19 @@ endif all: install: - install -d ${DESTDIR}/usr/share/image-configurations/base/configs - install -d ${DESTDIR}/usr/share/image-configurations/base/custom - install -d ${DESTDIR}/usr/share/image-configurations/base/scripts - install -d ${DESTDIR}/usr/share/image-configurations/base/partitions - install -m 644 base.yaml ${DESTDIR}/usr/share/image-configurations/base - install -m 644 base-repos.yaml ${DESTDIR}/usr/share/image-configurations/base - install -m 644 ks/*.yaml ${DESTDIR}/usr/share/image-configurations/base/configs - install -D partitions/* ${DESTDIR}/usr/share/image-configurations/base/partitions - install -D scripts/* ${DESTDIR}/usr/share/image-configurations/base/scripts + install -d ${DESTDIR}/usr/share/package-groups/pc + install -d ${DESTDIR}/usr/share/image-configurations/pc/configs + install -d ${DESTDIR}/usr/share/image-configurations/pc/scripts + install -d ${DESTDIR}/usr/share/image-configurations/pc/partitions + install -m 644 patterns/*.yaml ${DESTDIR}/usr/share/package-groups/pc + install -m 644 pc.yaml ${DESTDIR}/usr/share/image-configurations/pc + install -m 644 pc-repos.yaml ${DESTDIR}/usr/share/image-configurations/pc + install -m 644 ks/*.yaml ${DESTDIR}/usr/share/image-configurations/pc/configs + install -D partitions/* ${DESTDIR}/usr/share/image-configurations/pc/partitions + install -D scripts/* ${DESTDIR}/usr/share/image-configurations/pc/scripts test: - merge-patterns -o output/ -p patterns -s - kickstarter -c base.yaml -e ks -r base-repos.yaml - + kickstarter -c pc.yaml -r pc-repos.yaml -e ks/ tag: git tag -a $(VERSION) -m "$(VERSION)" git push --tags diff --git a/base-repos.yaml b/ivi-repos.yaml similarity index 100% rename from base-repos.yaml rename to ivi-repos.yaml diff --git a/base.yaml b/ivi.yaml similarity index 83% rename from base.yaml rename to ivi.yaml index 97f50ad..a1546f6 100644 --- a/base.yaml +++ b/ivi.yaml @@ -21,8 +21,12 @@ IVI: Architecture: x86_64 Desktop: None Mic2Options: -f liveusb --copy-kernel --runtime=native - Part: base + Part: ivi Groups: - Base System Repos: +<<<<<<< HEAD:ivi.yaml + - tizen +======= +>>>>>>> 758020ea80115d253127ba073dd7ea30c1ab6cd4:base.yaml - ivi diff --git a/ks/wayland-i586.yaml b/ks/ivi-wayland-i586.yaml similarity index 72% rename from ks/wayland-i586.yaml rename to ks/ivi-wayland-i586.yaml index 07aea30..7ce5367 100644 --- a/ks/wayland-i586.yaml +++ b/ks/ivi-wayland-i586.yaml @@ -1,8 +1,12 @@ -Name: Wayland-i586 +Name: IVI Wayland i586 Schedule: "*" Active: True Platform: IVI +<<<<<<< HEAD:ks/ivi-wayland-i586.yaml +FileName: ivi-wayland-i586 +======= FileName: wayland-i586 +>>>>>>> 758020ea80115d253127ba073dd7ea30c1ab6cd4:ks/wayland-i586.yaml Kernel: kernel-adaptation-pc Architecture: ia32 Mic2Options: -f raw --copy-kernel --compress-disk-image=bz2 --generate-bmap @@ -20,4 +24,4 @@ Groups: - Wayland - Development - Console Tools - - PC Adaptation + - IVI Adaptation diff --git a/packaging/meta-ivi.changes b/packaging/meta-ivi.changes index 7116000..25e56b4 100644 --- a/packaging/meta-ivi.changes +++ b/packaging/meta-ivi.changes @@ -1,2 +1,5 @@ +* Wed Jun 5 20:44:55 UTC 2013 - tracy.graydon@intel.com +- Fix this up to be in correct format, with ks and patterns + * Tue Jun 4 00:19:54 UTC 2013 - tracy.graydon@intel.com - Set up package-groups and image-configs for IVI diff --git a/packaging/meta-ivi.spec b/packaging/meta-ivi.spec index b763178..7f2e615 100644 --- a/packaging/meta-ivi.spec +++ b/packaging/meta-ivi.spec @@ -1,6 +1,6 @@ -Summary: Tizen IVI Package Groups and Image Configurations +Summary: IVI Meta Data Name: meta-ivi -Version: 002 +Version: 001 Release: 1 License: GPL-2.0 Group: System/Base @@ -8,20 +8,22 @@ URL: http://www.tizen.org Source: %{name}-%{version}.tar.bz2 %description -Tizen IVI Package Groups and Image Configurations +IVI Meta Data. +Includes patterns and image configurations for IVI images. %prep %setup -q %build -make +make %install %make_install %files -/usr/share/image-configurations/base/*.yaml -/usr/share/image-configurations/base/configs/*.yaml -/usr/share/image-configurations/base/scripts -/usr/share/image-configurations/base/partitions +%{_datadir}/package-groups/ivi/*.yaml +%{_datadir}/image-configurations/ivi/*.yaml +%{_datadir}/image-configurations/ivi/configs/*.yaml +%{_datadir}/image-configurations/ivi/partitions/* +%{_datadir}/image-configurations/ivi/scripts/* diff --git a/partitions/README.part b/partitions/README.ivi similarity index 100% rename from partitions/README.part rename to partitions/README.ivi diff --git a/partitions/base b/partitions/ivi similarity index 100% rename from partitions/base rename to partitions/ivi diff --git a/patterns/applications.yaml b/patterns/applications.yaml new file mode 100644 index 0000000..d1cfefb --- /dev/null +++ b/patterns/applications.yaml @@ -0,0 +1,5 @@ +Description: Applications +Name: applications +Packages: +- xterm +Summary: Applications diff --git a/patterns/base-desktop.yaml b/patterns/base-desktop.yaml new file mode 100644 index 0000000..8460844 --- /dev/null +++ b/patterns/base-desktop.yaml @@ -0,0 +1,22 @@ +Description: Base Desktop +Name: base-desktop +Packages: +- xhost +- cantarell-fonts +- dejavu-fonts +- google-droid-fonts +- xf86-video-fbdev +- xf86-input-evdev +- xorg-launch-helper +- update-desktop-files +- desktop-file-utils +- dbus-x11 +- xmodmap +- setxkbmap +- wpa_supplicant +- rfkill +- pulseaudio +- libva +- libva-intel-driver +- gstreamer-vaapi +Summary: Base Desktop diff --git a/patterns/base.yaml b/patterns/base.yaml new file mode 100644 index 0000000..44b0b95 --- /dev/null +++ b/patterns/base.yaml @@ -0,0 +1,32 @@ +Description: Base System +Name: base +Packages: +- e2fsprogs +- util-linux +- kmod-compat +- kmod +- tzdata +- pwdutils +- pam +- setup +- filesystem +- systemd +- bash +- coreutils +- rpm +- rpm-security-plugin +- curl +- tizen-release +- procps +- psmisc +- net-tools +- iputils +- iproute2 +- kbd +- glibc-locale +- pciutils +- connman +- ca-certificates-mozilla +- corewatcher +- snapper-zypp-plugin +Summary: Base System diff --git a/patterns/benchmarks.yaml b/patterns/benchmarks.yaml new file mode 100644 index 0000000..098a3e7 --- /dev/null +++ b/patterns/benchmarks.yaml @@ -0,0 +1,23 @@ +Description: Benchmarks +Name: benchmarks +Packages: +- blas-devel +- lapack-devel +- bzip2-devel +- zlib-devel +- glibc-devel +- libtool +- gcc-fortran +- cmake +- tcl +- popt-devel +- yasm +- phoronix-test-suite +- fftw3-devel +- lapack-devel +- libSDL-devel +- freeglut-devel +- pcre-devel +- zip +- unzip +Summary: Benchmarks diff --git a/patterns/console-tools.yaml b/patterns/console-tools.yaml new file mode 100644 index 0000000..37cfe12 --- /dev/null +++ b/patterns/console-tools.yaml @@ -0,0 +1,25 @@ +Description: Console Tools +Name: console-tools +Packages: +- zypper +- tar +- wget +- grep +- gzip +- openssh +- rsync +- parted +- zip +- vim +- unzip +- less +- xz +- nano +- strace +- diffutils +- patch +- findutils +- wdiff +- powertop +- sudo +Summary: Console Tools diff --git a/patterns/development.yaml b/patterns/development.yaml new file mode 100644 index 0000000..48323a7 --- /dev/null +++ b/patterns/development.yaml @@ -0,0 +1,44 @@ +Description: Development +Name: development +Packages: +- zip +- unzip +- less +- gcc +- glibc-devel +- libtool +- gcc-fortran +- cmake +- xz +- tcl +- gdb +- nano +- strace +- yasm +- make +- diffutils +- patch +- autoconf +- automake +- binutils-devel +- bison +- flex +- gcc-c++ +- libstdc++-devel +- libtool +- findutils +- wdiff +- nasm +- vim-enhanced +- powertop +- pulseaudio-utils +- gstreamer-utils +- alsa-utils +- connman-test +- pacrunner +- git-core +- valgrind +- lsof +- attr +- smack +Summary: Development diff --git a/patterns/enlightenment.yaml b/patterns/enlightenment.yaml new file mode 100644 index 0000000..3026d0a --- /dev/null +++ b/patterns/enlightenment.yaml @@ -0,0 +1,9 @@ +Description: Enlightenment +Name: enlightenment +Packages: +- enlightenment +- econnman +- terminology +- tizen-branding-default +- user-session-units-enlightenment +Summary: Enlightenment diff --git a/patterns/ivi-adaptation.yaml b/patterns/ivi-adaptation.yaml new file mode 100644 index 0000000..99546dd --- /dev/null +++ b/patterns/ivi-adaptation.yaml @@ -0,0 +1,12 @@ +Description: IVI Adaptation +Name: ivi-adaptation +Packages: + - dracut + - plymouth + - linux-firmware + - kernel-adaptation-pc + - xf86-input-synaptics + - xf86-video-intel + - xf86-input-keyboard + - pc-installer +Summary: IVI Adaptation diff --git a/patterns/wayland.yaml b/patterns/wayland.yaml new file mode 100644 index 0000000..162357b --- /dev/null +++ b/patterns/wayland.yaml @@ -0,0 +1,10 @@ +Description: Wayland +Name: wayland +Packages: + - cantarell-fonts + - dejavu-fonts + - weston + - xkeyboard-config + - tizen-branding-default + - user-session-units +Summary: Wayland -- 2.7.4