From 03c3c4ccf324f0d7c7236beb320128eed1ed0881 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Thu, 17 Jul 2014 20:00:28 +0200 Subject: Inherit from meta-generic patterns and scripts definitions Define new ARM images. Define new X11 images and repos Change-Id: Id57f0f32eb21af13e5b8f8c8e9f8094ce369913a Signed-off-by: Stephane Desneux Bug-Tizen: TC-1234 --- common-repos.yaml | 12 +++ common-targets.yaml | 38 ++++--- common.yaml | 65 ++++++++++-- ks/common-emulator-qa-unsafe-wayland-mbr-i586.yaml | 14 ++- ks/common-emulator-wayland-mbr-i586.yaml | 8 +- ks/common-installer-mbr-i586.yaml | 4 +- ks/common-minimal-2parts-armv7l.yaml | 11 ++ ks/common-minimal-mbr-i586.yaml | 5 +- ks/common-minimal-mbr-x86_64.yaml | 5 +- ks/common-qa-unsafe-minimal-2parts-armv7l.yaml | 19 ++++ ks/common-qa-unsafe-minimal-mbr-i586.yaml | 15 ++- ks/common-qa-unsafe-minimal-mbr-x86_64.yaml | 15 ++- ks/common-qa-unsafe-wayland-2parts-armv7l.yaml | 19 ++++ ks/common-qa-unsafe-wayland-mbr-i586.yaml | 14 ++- ks/common-qa-unsafe-wayland-mbr-x86_64.yaml | 14 ++- ks/common-qa-unsafe-x11-2parts-armv7l.yaml | 19 ++++ ks/common-qa-unsafe-x11-mbr-i586.yaml | 22 ++++ ks/common-qa-unsafe-x11-mbr-x86_64.yaml | 22 ++++ ks/common-wayland-2parts-armv7l.yaml | 10 ++ ks/common-wayland-mbr-armv7l.yaml | 11 -- ks/common-wayland-mbr-i586.yaml | 8 +- ks/common-wayland-mbr-x86_64.yaml | 8 +- ks/common-x11-2parts-armv7l.yaml | 10 ++ ks/common-x11-mbr-i586.yaml | 16 +++ ks/common-x11-mbr-x86_64.yaml | 16 +++ packaging/meta-common.spec | 2 + partitions/common-mbr | 2 +- partitions/common-mbr-2parts | 2 + patterns/common-adaptation.yaml | 5 - patterns/common-applications.yaml | 7 -- patterns/common-autoqa.yaml | 7 -- patterns/common-base-micro.yaml | 17 --- patterns/common-base.yaml | 31 +----- patterns/common-bluetooth.yaml | 9 -- patterns/common-console-tools.yaml | 29 ------ patterns/common-crosswalk.yaml | 2 - patterns/common-desktop-applications.yaml | 3 - patterns/common-development.yaml | 49 --------- patterns/common-middleware.yaml | 13 +-- patterns/common-multimedia.yaml | 20 ---- patterns/common-packaging.yaml | 5 +- patterns/common-qa.yaml | 9 -- patterns/common-qt5.yaml | 5 +- patterns/common-ref-m0.yaml | 8 -- patterns/common-wayland.yaml | 8 -- patterns/common-webkit.yaml | 17 --- scripts/buildname.nochroot | 6 -- scripts/common-adaptation.post | 1 - scripts/common-applications.post | 2 - scripts/common-autoqa.post | 34 ------ scripts/common-base-micro.post | 2 - scripts/common-base.post | 115 ++------------------- scripts/common-bluetooth.post | 2 - scripts/common-console-tools.post | 40 ------- scripts/common-crosswalk.post | 22 +--- scripts/common-desktop-applications.post | 45 +------- scripts/common-development.post | 2 - scripts/common-middleware.post | 3 +- scripts/common-multimedia.post | 19 ---- scripts/common-packaging.post | 9 +- scripts/common-qa.post | 3 +- scripts/common-qt5.post | 2 +- scripts/common-wayland.post | 17 +-- scripts/common-webkit.post | 59 ----------- 64 files changed, 377 insertions(+), 656 deletions(-) create mode 100644 ks/common-minimal-2parts-armv7l.yaml create mode 100644 ks/common-qa-unsafe-minimal-2parts-armv7l.yaml create mode 100644 ks/common-qa-unsafe-wayland-2parts-armv7l.yaml create mode 100644 ks/common-qa-unsafe-x11-2parts-armv7l.yaml create mode 100644 ks/common-qa-unsafe-x11-mbr-i586.yaml create mode 100644 ks/common-qa-unsafe-x11-mbr-x86_64.yaml create mode 100644 ks/common-wayland-2parts-armv7l.yaml delete mode 100644 ks/common-wayland-mbr-armv7l.yaml create mode 100644 ks/common-x11-2parts-armv7l.yaml create mode 100644 ks/common-x11-mbr-i586.yaml create mode 100644 ks/common-x11-mbr-x86_64.yaml create mode 100644 partitions/common-mbr-2parts delete mode 100644 patterns/common-adaptation.yaml delete mode 100644 patterns/common-applications.yaml delete mode 100644 patterns/common-autoqa.yaml delete mode 100644 patterns/common-base-micro.yaml delete mode 100644 patterns/common-bluetooth.yaml delete mode 100644 patterns/common-console-tools.yaml delete mode 100644 patterns/common-development.yaml delete mode 100644 patterns/common-multimedia.yaml delete mode 100644 patterns/common-ref-m0.yaml delete mode 100644 patterns/common-webkit.yaml delete mode 100644 scripts/buildname.nochroot delete mode 100644 scripts/common-adaptation.post delete mode 100644 scripts/common-applications.post delete mode 100644 scripts/common-autoqa.post delete mode 100644 scripts/common-base-micro.post delete mode 100644 scripts/common-bluetooth.post delete mode 100644 scripts/common-console-tools.post delete mode 100644 scripts/common-development.post delete mode 100644 scripts/common-multimedia.post delete mode 100644 scripts/common-webkit.post diff --git a/common-repos.yaml b/common-repos.yaml index f9d1bb3..34a11fb 100644 --- a/common-repos.yaml +++ b/common-repos.yaml @@ -18,3 +18,15 @@ Repositories: - Name: common-emulator-wayland_i586 Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/emulator32-wayland/packages/ Options: --ssl_verify=no + + - Name: common-x11_i586 + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/ia32-x11/packages/ + Options: --ssl_verify=no + + - Name: common-x11_x86_64 + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/x86_64-x11/packages/ + Options: --ssl_verify=no + + - Name: common-x11_armv7l + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/arm-x11/packages/ + Options: --ssl_verify=no diff --git a/common-targets.yaml b/common-targets.yaml index eb276c3..ecfcb74 100644 --- a/common-targets.yaml +++ b/common-targets.yaml @@ -3,29 +3,39 @@ Targets: - Name: ia32-wayland Images: - common-installer-mbr-i586.yaml - - common-minimal-mbr-i586.yaml - - common-qa-unsafe-minimal-mbr-i586.yaml - - common-qa-unsafe-wayland-mbr-i586.yaml - common-wayland-mbr-i586.yaml + - common-qa-unsafe-wayland-mbr-i586.yaml + + - Name: emulator32-wayland + Images: + - common-emulator-wayland-mbr-i586.yaml + - common-emulator-qa-unsafe-wayland-mbr-i586.yaml + + - Name: ia32-x11 + Images: + - common-x11-mbr-i586.yaml + - common-qa-unsafe-x11-mbr-i586.yaml - Name: x86_64-wayland Images: - - common-minimal-mbr-x86_64.yaml - - common-qa-unsafe-minimal-mbr-x86_64.yaml - - common-qa-unsafe-wayland-mbr-x86_64.yaml - common-wayland-mbr-x86_64.yaml + - common-qa-unsafe-wayland-mbr-x86_64.yaml - - Name: arm-wayland + - Name: x86_64-x11 Images: - - common-wayland-mbr-armv7l.yaml + - common-x11-mbr-x86_64.yaml + - common-qa-unsafe-x11-mbr-x86_64.yaml - - Name: arm64-wayland - Images: [] - - - Name: emulator32-wayland + - Name: arm-wayland Images: - - common-emulator-qa-unsafe-wayland-mbr-i586.yaml - - common-emulator-wayland-mbr-i586.yaml + - common-wayland-2parts-armv7l.yaml + - common-qa-unsafe-wayland-2parts-armv7l.yaml - Name: arm-x11 + Images: + - common-x11-2parts-armv7l.yaml + - common-qa-unsafe-x11-2parts-armv7l.yaml + + - Name: arm64-wayland Images: [] + diff --git a/common.yaml b/common.yaml index eaa365a..10dd666 100644 --- a/common.yaml +++ b/common.yaml @@ -18,15 +18,19 @@ Default: SaveRepos: False UserGroups: "audio,video" Groups: + - Generic Base - Common Base - - Common Console Tools + - Generic Console Tools + - Generic Packaging - Common Packaging - - Common Adaptation + - Generic Adaptation PostScripts: + - generic-base - common-base - - common-console-tools + - generic-console-tools + - generic-packaging - common-packaging - - common-adaptation + - generic-adaptation NoChrootScripts: - buildname @@ -43,21 +47,62 @@ Wayland: Part: common-mbr UserGroups: "audio,video" Groups: + - Generic Wayland - Common Wayland + - Generic Middleware - Common Middleware - - Common Applications - - Common Bluetooth - - Common Multimedia + - Generic Applications + - Generic Bluetooth + - Generic Multimedia + - Generic Desktop Applications - Common Desktop Applications + - Generic Crosswalk - Common Crosswalk + - Generic Qt5 - Common Qt5 PostScripts: + - generic-wayland - common-wayland + - generic-middleware - common-middleware - - common-applications - - common-bluetooth - - common-multimedia + - generic-applications + - generic-bluetooth + - generic-multimedia + - generic-desktop-applications - common-desktop-applications + - generic-crosswalk - common-crosswalk + - generic-qt5 + - common-qt5 + Repos: [] + +X11: + Part: common-mbr + UserGroups: "audio,video" + Groups: + - Generic X11 + - Generic Middleware + - Common Middleware + - Generic Applications + - Generic Bluetooth + - Generic Multimedia + - Generic Desktop Applications + - Common Desktop Applications + - Generic Crosswalk + - Common Crosswalk + - Generic Qt5 + - Common Qt5 + PostScripts: + - generic-x11 + - generic-middleware + - common-middleware + - generic-applications + - generic-bluetooth + - generic-multimedia + - generic-desktop-applications + - common-desktop-applications + - generic-crosswalk + - common-crosswalk + - generic-qt5 - common-qt5 Repos: [] diff --git a/ks/common-emulator-qa-unsafe-wayland-mbr-i586.yaml b/ks/common-emulator-qa-unsafe-wayland-mbr-i586.yaml index 648a79e..9414410 100644 --- a/ks/common-emulator-qa-unsafe-wayland-mbr-i586.yaml +++ b/ks/common-emulator-qa-unsafe-wayland-mbr-i586.yaml @@ -1,4 +1,4 @@ -Name: Common Emulator QA Unsafe Wayland MBR i586 +Name: common-emulator-qa-unsafe-wayland-mbr-i586 Architecture: ia32 Schedule: "*" Active: True @@ -6,13 +6,19 @@ Platform: Wayland Part: common-mbr Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: common-emulator-qa-unsafe-wayland-mbr-i586 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-emulator-wayland_i586 Groups: - - Common Automated QA Tools + - Generic Multimedia Intel + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools ExtraPackages: - sdbd - system-plugin-emulator PostScripts: - - common-autoqa + - generic-multimedia-intel + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-emulator-wayland-mbr-i586.yaml b/ks/common-emulator-wayland-mbr-i586.yaml index ba5e5f8..401b61f 100644 --- a/ks/common-emulator-wayland-mbr-i586.yaml +++ b/ks/common-emulator-wayland-mbr-i586.yaml @@ -1,4 +1,4 @@ -Name: Common Emulator Wayland MBR i586 +Name: common-emulator-wayland-mbr-i586 Architecture: ia32 Schedule: "*" Active: True @@ -6,9 +6,13 @@ Platform: Wayland Part: common-mbr Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: common-emulator-wayland-mbr-i586 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-emulator-wayland_i586 ExtraPackages: - sdbd - system-plugin-emulator +Groups: + - Generic Multimedia Intel +PostScripts: + - generic-multimedia-intel diff --git a/ks/common-installer-mbr-i586.yaml b/ks/common-installer-mbr-i586.yaml index f145257..f79a203 100644 --- a/ks/common-installer-mbr-i586.yaml +++ b/ks/common-installer-mbr-i586.yaml @@ -1,11 +1,11 @@ -Name: Common Installer MBR i586 +Name: common-installer-mbr-i586 Architecture: ia32 Schedule: "*" Active: True Platform: Installer Part: common-mbr FileName: common-installer-mbr-i586 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_i586 ExtraPackages: diff --git a/ks/common-minimal-2parts-armv7l.yaml b/ks/common-minimal-2parts-armv7l.yaml new file mode 100644 index 0000000..42ca5ab --- /dev/null +++ b/ks/common-minimal-2parts-armv7l.yaml @@ -0,0 +1,11 @@ +Name: common-minimal-2parts-armv7l +Architecture: armv7l +Schedule: "*" +Active: True +Platform: Minimal +Part: common-mbr-2parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: common-minimal-2parts-armv7l +Kernel: kernel-profile-common +Repos: + - common-wayland_armv7l diff --git a/ks/common-minimal-mbr-i586.yaml b/ks/common-minimal-mbr-i586.yaml index 60fbe97..e184c66 100644 --- a/ks/common-minimal-mbr-i586.yaml +++ b/ks/common-minimal-mbr-i586.yaml @@ -1,9 +1,10 @@ -Name: Common Minimal MBR i586 +Name: common-minimal-mbr-i586 Architecture: ia32 +Schedule: "*" Active: True Platform: Minimal Part: common-mbr FileName: common-minimal-mbr-i586 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_i586 diff --git a/ks/common-minimal-mbr-x86_64.yaml b/ks/common-minimal-mbr-x86_64.yaml index 4d3545e..ed3e212 100644 --- a/ks/common-minimal-mbr-x86_64.yaml +++ b/ks/common-minimal-mbr-x86_64.yaml @@ -1,9 +1,10 @@ -Name: Common Minimal MBR x86_64 +Name: common-minimal-mbr-x86_64 Architecture: x86_64 +Schedule: "*" Active: True Platform: Minimal Part: common-mbr FileName: common-minimal-mbr-x86_64 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_x86_64 diff --git a/ks/common-qa-unsafe-minimal-2parts-armv7l.yaml b/ks/common-qa-unsafe-minimal-2parts-armv7l.yaml new file mode 100644 index 0000000..dfa0567 --- /dev/null +++ b/ks/common-qa-unsafe-minimal-2parts-armv7l.yaml @@ -0,0 +1,19 @@ +Name: common-qa-unsafe-minimal-2parts-armv7l +Architecture: armv7l +Schedule: "*" +Active: True +Platform: Minimal +Part: common-mbr-2parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: common-qa-unsafe-minimal-2parts-armv7l +Kernel: kernel-profile-common +Repos: + - common-wayland_armv7l +Groups: + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools +PostScripts: + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-minimal-mbr-i586.yaml b/ks/common-qa-unsafe-minimal-mbr-i586.yaml index 70f6959..7f5e091 100644 --- a/ks/common-qa-unsafe-minimal-mbr-i586.yaml +++ b/ks/common-qa-unsafe-minimal-mbr-i586.yaml @@ -1,13 +1,18 @@ -Name: Common Minimal MBR i586 +Name: common-qa-unsafe-minimal-mbr-i586 Architecture: ia32 +Schedule: "*" Active: True Platform: Minimal Part: common-mbr -FileName: common-minimal-mbr-i586 -Kernel: kernel-x86-common +FileName: common-qa-unsafe-minimal-mbr-i586 +Kernel: kernel-profile-common Repos: - common-wayland_i586 Groups: - - Common Automated QA Tools + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools PostScripts: - - common-autoqa + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml b/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml index c80e280..7d7cab6 100644 --- a/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml +++ b/ks/common-qa-unsafe-minimal-mbr-x86_64.yaml @@ -1,13 +1,18 @@ -Name: Common Minimal MBR x86_64 +Name: common-qa-unsafe-minimal-mbr-x86_64 Architecture: x86_64 +Schedule: "*" Active: True Platform: Minimal Part: common-mbr -FileName: common-minimal-mbr-x86_64 -Kernel: kernel-x86-common +FileName: common-qa-unsafe-minimal-mbr-x86_64 +Kernel: kernel-profile-common Repos: - common-wayland_x86_64 Groups: - - Common Automated QA Tools + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools PostScripts: - - common-autoqa + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-wayland-2parts-armv7l.yaml b/ks/common-qa-unsafe-wayland-2parts-armv7l.yaml new file mode 100644 index 0000000..3e067a5 --- /dev/null +++ b/ks/common-qa-unsafe-wayland-2parts-armv7l.yaml @@ -0,0 +1,19 @@ +Name: common-qa-unsafe-wayland-2parts-armv7l +Architecture: armv7l +Schedule: "*" +Active: True +Platform: Wayland +Part: common-mbr-2parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: common-qa-unsafe-wayland-2parts-armv7l +Kernel: kernel-profile-common +Repos: + - common-wayland_armv7l +Groups: + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools +PostScripts: + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-wayland-mbr-i586.yaml b/ks/common-qa-unsafe-wayland-mbr-i586.yaml index e85b011..e6d6a3d 100644 --- a/ks/common-qa-unsafe-wayland-mbr-i586.yaml +++ b/ks/common-qa-unsafe-wayland-mbr-i586.yaml @@ -1,14 +1,20 @@ -Name: Common QA Unsafe Wayland MBR i586 +Name: common-qa-unsafe-wayland-mbr-i586 Architecture: ia32 Schedule: "*" Active: True Platform: Wayland Part: common-mbr FileName: common-qa-unsafe-wayland-mbr-i586 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_i586 Groups: - - Common Automated QA Tools + - Generic Multimedia Intel + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools PostScripts: - - common-autoqa + - generic-multimedia-intel + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml b/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml index a5174bf..49db928 100644 --- a/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml +++ b/ks/common-qa-unsafe-wayland-mbr-x86_64.yaml @@ -1,14 +1,20 @@ -Name: Common QA Unsafe Wayland MBR x86_64 +Name: common-qa-unsafe-wayland-mbr-x86_64 Architecture: x86_64 Schedule: "*" Active: True Platform: Wayland Part: common-mbr FileName: common-qa-unsafe-wayland-mbr-x86_64 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_x86_64 Groups: - - Common Automated QA Tools + - Generic Multimedia Intel + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools PostScripts: - - common-autoqa + - generic-multimedia-intel + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-x11-2parts-armv7l.yaml b/ks/common-qa-unsafe-x11-2parts-armv7l.yaml new file mode 100644 index 0000000..6652272 --- /dev/null +++ b/ks/common-qa-unsafe-x11-2parts-armv7l.yaml @@ -0,0 +1,19 @@ +Name: common-qa-unsafe-x11-2parts-armv7l +Architecture: armv7l +Schedule: "*" +Active: True +Platform: X11 +Part: common-mbr-2parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: common-qa-unsafe-x11-2parts-armv7l +Kernel: kernel-profile-common +Repos: + - common-x11_armv7l +Groups: + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools +PostScripts: + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-x11-mbr-i586.yaml b/ks/common-qa-unsafe-x11-mbr-i586.yaml new file mode 100644 index 0000000..6deabec --- /dev/null +++ b/ks/common-qa-unsafe-x11-mbr-i586.yaml @@ -0,0 +1,22 @@ +Name: common-qa-unsafe-x11-mbr-i586 +Architecture: ia32 +Schedule: "*" +Active: True +Platform: X11 +Part: common-mbr +FileName: common-qa-unsafe-x11-mbr-i586 +Kernel: kernel-profile-common +Repos: + - common-x11_i586 +Groups: + - Generic X11 Intel + - Generic Multimedia Intel + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools +PostScripts: + - generic-x11-intel + - generic-multimedia-intel + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-qa-unsafe-x11-mbr-x86_64.yaml b/ks/common-qa-unsafe-x11-mbr-x86_64.yaml new file mode 100644 index 0000000..926a396 --- /dev/null +++ b/ks/common-qa-unsafe-x11-mbr-x86_64.yaml @@ -0,0 +1,22 @@ +Name: common-qa-unsafe-x11-mbr-x86_64 +Architecture: x86_64 +Schedule: "*" +Active: True +Platform: X11 +Part: common-mbr +FileName: common-qa-unsafe-x11-mbr-x86_64 +Kernel: kernel-profile-common +Repos: + - common-x11_x86_64 +Groups: + - Generic X11 Intel + - Generic Multimedia Intel + - Generic Automated QA Tools + - Generic QA Tools + - Common QA Tools +PostScripts: + - generic-x11-intel + - generic-multimedia-intel + - generic-autoqa + - generic-qa + - common-qa diff --git a/ks/common-wayland-2parts-armv7l.yaml b/ks/common-wayland-2parts-armv7l.yaml new file mode 100644 index 0000000..5deca83 --- /dev/null +++ b/ks/common-wayland-2parts-armv7l.yaml @@ -0,0 +1,10 @@ +Name: common-wayland-2parts-armv7l +Architecture: armv7l +Schedule: "*" +Active: True +Platform: Wayland +Part: common-mbr-2parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: common-wayland-2parts-armv7l +Repos: + - common-wayland_armv7l diff --git a/ks/common-wayland-mbr-armv7l.yaml b/ks/common-wayland-mbr-armv7l.yaml deleted file mode 100644 index 8b2d50a..0000000 --- a/ks/common-wayland-mbr-armv7l.yaml +++ /dev/null @@ -1,11 +0,0 @@ -Name: Common Wayland MBR armv7l -Architecture: armv7l -Schedule: "*" -Active: True -Platform: Wayland -Part: common-mbr -FileName: common-wayland-mbr-armv7l -Repos: - - common-wayland_armv7l -Groups: - - Common Ref M0 diff --git a/ks/common-wayland-mbr-i586.yaml b/ks/common-wayland-mbr-i586.yaml index 9d4fd81..91e409c 100644 --- a/ks/common-wayland-mbr-i586.yaml +++ b/ks/common-wayland-mbr-i586.yaml @@ -1,10 +1,14 @@ -Name: Common Wayland MBR i586 +Name: common-wayland-mbr-i586 Architecture: ia32 Schedule: "*" Active: True Platform: Wayland Part: common-mbr FileName: common-wayland-mbr-i586 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_i586 +Groups: + - Generic Multimedia Intel +PostScripts: + - generic-multimedia-intel diff --git a/ks/common-wayland-mbr-x86_64.yaml b/ks/common-wayland-mbr-x86_64.yaml index 9bd7087..c89e9c9 100644 --- a/ks/common-wayland-mbr-x86_64.yaml +++ b/ks/common-wayland-mbr-x86_64.yaml @@ -1,10 +1,14 @@ -Name: Common Wayland MBR x86_64 +Name: common-wayland-mbr-x86_64 Architecture: x86_64 Schedule: "*" Active: True Platform: Wayland Part: common-mbr FileName: common-wayland-mbr-x86_64 -Kernel: kernel-x86-common +Kernel: kernel-profile-common Repos: - common-wayland_x86_64 +Groups: + - Generic Multimedia Intel +PostScripts: + - generic-multimedia-intel diff --git a/ks/common-x11-2parts-armv7l.yaml b/ks/common-x11-2parts-armv7l.yaml new file mode 100644 index 0000000..1bd1f0f --- /dev/null +++ b/ks/common-x11-2parts-armv7l.yaml @@ -0,0 +1,10 @@ +Name: common-x11-2parts-armv7l +Architecture: armv7l +Schedule: "*" +Active: True +Platform: X11 +Part: common-mbr-2parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: common-x11-2parts-armv7l +Repos: + - common-x11_armv7l diff --git a/ks/common-x11-mbr-i586.yaml b/ks/common-x11-mbr-i586.yaml new file mode 100644 index 0000000..e681922 --- /dev/null +++ b/ks/common-x11-mbr-i586.yaml @@ -0,0 +1,16 @@ +Name: common-x11-mbr-i586 +Architecture: ia32 +Schedule: "*" +Active: True +Platform: X11 +Part: common-mbr +FileName: common-x11-mbr-i586 +Kernel: kernel-profile-common +Repos: + - common-x11_i586 +Groups: + - Generic X11 Intel + - Generic Multimedia Intel +PostScripts: + - generic-x11-intel + - generic-multimedia-intel diff --git a/ks/common-x11-mbr-x86_64.yaml b/ks/common-x11-mbr-x86_64.yaml new file mode 100644 index 0000000..6fba8b1 --- /dev/null +++ b/ks/common-x11-mbr-x86_64.yaml @@ -0,0 +1,16 @@ +Name: common-x11-mbr-x86_64 +Architecture: x86_64 +Schedule: "*" +Active: True +Platform: X11 +Part: common-mbr +FileName: common-x11-mbr-x86_64 +Kernel: kernel-profile-common +Repos: + - common-x11_x86_64 +Groups: + - Generic X11 Intel + - Generic Multimedia Intel +PostScripts: + - generic-x11-intel + - generic-multimedia-intel diff --git a/packaging/meta-common.spec b/packaging/meta-common.spec index 7cace06..ec25133 100644 --- a/packaging/meta-common.spec +++ b/packaging/meta-common.spec @@ -10,6 +10,8 @@ Group: Base/Configuration URL: http://www.tizen.org Source: %{name}-%{version}.tar.bz2 +Requires: meta-generic + %description Common Meta Data. Includes patterns and image configurations for Common images. diff --git a/partitions/common-mbr b/partitions/common-mbr index fdb22ae..8d7d5cc 100644 --- a/partitions/common-mbr +++ b/partitions/common-mbr @@ -1 +1 @@ -part / --fstype="ext4" --ondisk=sda --size=3584 --active --label tizen-common +part / --fstype="ext4" --size=3584 --ondisk=sda --active --label tizen-common --fsoptions=defaults,noatime diff --git a/partitions/common-mbr-2parts b/partitions/common-mbr-2parts new file mode 100644 index 0000000..13ae9d4 --- /dev/null +++ b/partitions/common-mbr-2parts @@ -0,0 +1,2 @@ +part /boot --fstype="vfat" --size=64 --ondisk=sda --active --label TZBOOT --fsoptions=defaults,noatime +part / --fstype="ext4" --size=3500 --ondisk=sda --label tizen-common --fsoptions=defaults,noatime diff --git a/patterns/common-adaptation.yaml b/patterns/common-adaptation.yaml deleted file mode 100644 index aae04bc..0000000 --- a/patterns/common-adaptation.yaml +++ /dev/null @@ -1,5 +0,0 @@ -Summary: Common Adaptation -Description: Common Adaptation -Name: common-adaptation -Packages: -- linux-firmware diff --git a/patterns/common-applications.yaml b/patterns/common-applications.yaml deleted file mode 100644 index 80d63d7..0000000 --- a/patterns/common-applications.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Common Applications -Description: Common Applications -Name: common-applications -Packages: -- ail -- ca-certificates -- ca-certificates-mozilla diff --git a/patterns/common-autoqa.yaml b/patterns/common-autoqa.yaml deleted file mode 100644 index 9a6e432..0000000 --- a/patterns/common-autoqa.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Common Automated QA Tools -Description: Common Automated QA Tools -Name: common-autoqa -Packages: -- testkit-lite -- screen -- which diff --git a/patterns/common-base-micro.yaml b/patterns/common-base-micro.yaml deleted file mode 100644 index c914659..0000000 --- a/patterns/common-base-micro.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Summary: Common Base Micro -Description: Common Base Micro -Name: common-base-micro -Packages: -- bluez -- kmod -- tzdata -- pam -- setup -- filesystem -- systemd -- busybox -- default-ac-domains -- tizen-release -- glibc-locale -- pciutils -- lrzsz diff --git a/patterns/common-base.yaml b/patterns/common-base.yaml index 141443b..56168e1 100644 --- a/patterns/common-base.yaml +++ b/patterns/common-base.yaml @@ -1,32 +1,5 @@ Summary: Common Base Description: Common Base Name: common-base -Packages: -- e2fsprogs -- connman -- rfkill -- util-linux -- kmod-compat -- kmod -- tzdata -- pwdutils -- pam -- setup -- filesystem -- systemd -- bash -- coreutils -- rpm -- rpm-security-plugin -- default-ac-domains -- tizen-release -- pam-locale -- procps -- psmisc -- net-tools -- kbd -- glibc-locale -- pciutils -- default-ac-domains -- wpa_supplicant -- prelink +Packages: [] + diff --git a/patterns/common-bluetooth.yaml b/patterns/common-bluetooth.yaml deleted file mode 100644 index 6105873..0000000 --- a/patterns/common-bluetooth.yaml +++ /dev/null @@ -1,9 +0,0 @@ -Summary: Common Bluetooth -Description: Common Bluetooth -Name: common-bluetooth -Packages: -- bluez -- bluetooth-frwk-core -- bluetooth-frwk-service -- bluetooth-share -- bluetooth-tools-no-firmware diff --git a/patterns/common-console-tools.yaml b/patterns/common-console-tools.yaml deleted file mode 100644 index 55f3670..0000000 --- a/patterns/common-console-tools.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Summary: Common Console Tools -Description: Common Console Tools -Name: common-console-tools -Packages: -- snapper-zypp-plugin -- tar -- wget -- grep -- gzip -- openssh -- rsync -- parted -- zip -- vim -- unzip -- less -- xz -- nano -- curl -- strace -- diffutils -- patch -- findutils -- wdiff -- powertop -- sudo -- ca-certificates-mozilla -- iptables -- tree diff --git a/patterns/common-crosswalk.yaml b/patterns/common-crosswalk.yaml index 71d91dc..8b9a477 100644 --- a/patterns/common-crosswalk.yaml +++ b/patterns/common-crosswalk.yaml @@ -2,7 +2,5 @@ Summary: Common Crosswalk Description: Common Crosswalk Name: common-crosswalk Packages: -- crosswalk -- tizen-extensions-crosswalk - wrt-widgets diff --git a/patterns/common-desktop-applications.yaml b/patterns/common-desktop-applications.yaml index f04ab20..fc3cc0a 100644 --- a/patterns/common-desktop-applications.yaml +++ b/patterns/common-desktop-applications.yaml @@ -3,9 +3,6 @@ Description: Common Desktop Applications Name: common-desktop-applications Packages: - weston-clients -- emotion -#- econnman -#- bluetooth-agent - org.tizen.calculator - elementary-tools - evas-examples diff --git a/patterns/common-development.yaml b/patterns/common-development.yaml deleted file mode 100644 index 26b1504..0000000 --- a/patterns/common-development.yaml +++ /dev/null @@ -1,49 +0,0 @@ -Summary: Common Development -Description: Common Development -Name: common-development -Packages: -- zip -- unzip -- less -- gcc -- glibc-devel -- libtool -- gcc-fortran -- cmake -- xz -- tcl -- gdb -- gdb-server -- 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 -- corewatcher -- iputils -- iproute2 -- which diff --git a/patterns/common-middleware.yaml b/patterns/common-middleware.yaml index a0bd713..4bf0c9c 100644 --- a/patterns/common-middleware.yaml +++ b/patterns/common-middleware.yaml @@ -2,17 +2,8 @@ Summary: Common Middleware Description: Common Middleware Name: common-middleware Packages: -- calendar-service -- csr-framework -- elm-misc -- efl-theme-tizen-hd -- evolution-data-server -- libprivilege-control-conf - model-config-generic -- notification-service +- ofono - neard - neardal -- obexd -- ofono -- pkgmgr-server -- sqlite3 + diff --git a/patterns/common-multimedia.yaml b/patterns/common-multimedia.yaml deleted file mode 100644 index 4d2c455..0000000 --- a/patterns/common-multimedia.yaml +++ /dev/null @@ -1,20 +0,0 @@ -Summary: Common Multimedia -Description: Common Multimedia -Name: common-multimedia -Packages: -- alsa-utils -- alsa-plugins-pulse -- pulseaudio -- pulseaudio-config -- pulseaudio-locale -- pulseaudio-module-bluetooth -- pulseaudio-utils -- gst-libav -- gst-plugins-bad -- gst-plugins-base -- gst-plugins-good -- gstreamer -- gstreamer-vaapi -- gstreamer-utils -- libva-intel-driver -- vaapi-tools diff --git a/patterns/common-packaging.yaml b/patterns/common-packaging.yaml index 1a17c08..6aa6a51 100644 --- a/patterns/common-packaging.yaml +++ b/patterns/common-packaging.yaml @@ -1,6 +1,5 @@ Summary: Common Packaging Description: Common Packaging Name: common-packaging -Packages: -- gpg2 -- zypper +Packages: [] + diff --git a/patterns/common-qa.yaml b/patterns/common-qa.yaml index 4defad2..e4ea382 100644 --- a/patterns/common-qa.yaml +++ b/patterns/common-qa.yaml @@ -2,14 +2,5 @@ Summary: Common QA Tools Description: Common QA Tools Name: common-qa Packages: -- bluez-test -- connman-test -- dbus-python -- dlogutil -- eet-tools -- gdb -- gstreamer-utils - neard-test - ofono-test -- python-xml -- wget diff --git a/patterns/common-qt5.yaml b/patterns/common-qt5.yaml index 21df52c..9b9ffc7 100644 --- a/patterns/common-qt5.yaml +++ b/patterns/common-qt5.yaml @@ -1,7 +1,4 @@ Summary: Common Qt5 Description: Common Qt5 Name: common-qt5 -Packages: -- qt5-tools -- qt5-qtdeclarative-examples -- qt5-qtwayland +Packages: [] diff --git a/patterns/common-ref-m0.yaml b/patterns/common-ref-m0.yaml deleted file mode 100644 index f7aed5a..0000000 --- a/patterns/common-ref-m0.yaml +++ /dev/null @@ -1,8 +0,0 @@ -Summary: Common Ref M0 -Description: Common Ref M0 -Name: common-ref-m0 -Packages: -- usb-server -- usbutils -- sdbd -- security-server diff --git a/patterns/common-wayland.yaml b/patterns/common-wayland.yaml index 9f9747e..4ed8712 100644 --- a/patterns/common-wayland.yaml +++ b/patterns/common-wayland.yaml @@ -2,15 +2,7 @@ Summary: Common Wayland Description: Common Wayland Name: common-wayland Packages: -- cantarell-fonts -- dejavu-fonts -- weston - weston-common - weston-common-config - weston-clients - weston-common-tz-launcher -- mesa -- xkeyboard-config -- tizen-branding-default -- user-session-units -- desktop-skin diff --git a/patterns/common-webkit.yaml b/patterns/common-webkit.yaml deleted file mode 100644 index 5868caf..0000000 --- a/patterns/common-webkit.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Summary: Common Webkit -Description: Common Webkit -Name: common-webkit -Packages: -- wrt-widgets -- wrt -- wrt-commons -- wrt-installer -- wrt-installer-preinstall-service -- wrt-plugins-tizen -- wrt-security -- webkit2-efl-test -- 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 diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot deleted file mode 100644 index b248084..0000000 --- a/scripts/buildname.nochroot +++ /dev/null @@ -1,6 +0,0 @@ -####################### 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 "$IMG_NAME @BUILD_ID@" >>$INSTALL_ROOT/etc/tizen-snapshot -fi diff --git a/scripts/common-adaptation.post b/scripts/common-adaptation.post deleted file mode 100644 index f40abd4..0000000 --- a/scripts/common-adaptation.post +++ /dev/null @@ -1 +0,0 @@ -############### common-adaptation.post ################ diff --git a/scripts/common-applications.post b/scripts/common-applications.post deleted file mode 100644 index 5a7c804..0000000 --- a/scripts/common-applications.post +++ /dev/null @@ -1,2 +0,0 @@ -############### common-applications.post ################ - diff --git a/scripts/common-autoqa.post b/scripts/common-autoqa.post deleted file mode 100644 index c34dc2a..0000000 --- a/scripts/common-autoqa.post +++ /dev/null @@ -1,34 +0,0 @@ -##################### common-autoqa.post ####################### - -# generate private/public key for autologin as root - -mkdir /root/.ssh -chown root:root /root/.ssh -chmod 700 /root/.ssh - -# 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 - -# adjust permissions on ssh config files -chmod 600 /root/.ssh/* diff --git a/scripts/common-base-micro.post b/scripts/common-base-micro.post deleted file mode 100644 index cc211f5..0000000 --- a/scripts/common-base-micro.post +++ /dev/null @@ -1,2 +0,0 @@ -############### common-base-micro.post ################ - diff --git a/scripts/common-base.post b/scripts/common-base.post index 3c2825f..e34f86c 100644 --- a/scripts/common-base.post +++ b/scripts/common-base.post @@ -1,111 +1,18 @@ -################ common-base.post ################## +#!/bin/sh +echo "############### common-base.post ################" -# setup systemd default target for user session -cat <<'EOF' >>/lib/systemd/user/default.target -[Unit] -Description=User session default target -EOF -mkdir -p /lib/systemd/user/default.target.wants - -# start dbus session -ln -s ../dbus.service /lib/systemd/user/default.target.wants/ - -# Run prelink to speed up dynamic binary/library loading -/usr/sbin/prelink --all - -ln -sf /proc/self/mounts /etc/mtab - -# fix TIVI-2291 -sed -ri "s/(^blacklist i8042.*$)/#fix from base-general.post \1/" /etc/modprobe.d/blacklist.conf - -# sdx: fix smack labels on /var/log -chsmack -a '*' /var/log - -# 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 - -# bug workaround on MIC (DEVT-160) -if [ -e /etc/sysconfig/i18n -a ! -e /etc/locale.conf ]; then - unset LANG - unset LC_CTYPE - unset LC_NUMERIC - unset LC_TIME - unset LC_COLLATE - unset LC_MONETARY - unset LC_MESSAGES - unset LC_PAPER - unset LC_NAME - unset LC_ADDRESS - unset LC_TELEPHONE - unset LC_MEASUREMENT - unset LC_IDENTIFICATION - . /etc/sysconfig/i18n - rm -f /etc/sysconfig/i18n - [ -n "$LANG" ] && echo LANG=$LANG > /etc/locale.conf - [ -n "$LC_CTYPE" ] && echo LC_CTYPE=$LC_CTYPE >> /etc/locale.conf - [ -n "$LC_NUMERIC" ] && echo LC_NUMERIC=$LC_NUMERIC >> /etc/locale.conf - [ -n "$LC_TIME" ] && echo LC_TIME=$LC_TIME >> /etc/locale.conf - [ -n "$LC_COLLATE" ] && echo LC_COLLATE=$LC_COLLATE >> /etc/locale.conf - [ -n "$LC_MONETARY" ] && echo LC_MONETARY=$LC_MONETARY >> /etc/locale.conf - [ -n "$LC_MESSAGES" ] && echo LC_MESSAGES=$LC_MESSAGES >> /etc/locale.conf - [ -n "$LC_PAPER" ] && echo LC_PAPER=$LC_PAPER >> /etc/locale.conf - [ -n "$LC_NAME" ] && echo LC_NAME=$LC_NAME >> /etc/locale.conf - [ -n "$LC_ADDRESS" ] && echo LC_ADDRESS=$LC_ADDRESS >> /etc/locale.conf - [ -n "$LC_TELEPHONE" ] && echo LC_TELEPHONE=$LC_TELEPHONE >> /etc/locale.conf - [ -n "$LC_MEASUREMENT" ] && echo LC_MEASUREMENT=$LC_MEASUREMENT >> /etc/locale.conf - [ -n "$LC_IDENTIFICATION" ] && echo LC_IDENTIFICATION=$LC_IDENTIFICATION >> /etc/locale.conf -fi - -# workaround for bug PTREL-763 -patch -b -p1 -d/ <<'EOF' ---- bad/etc/pam.d/systemd-user 2014-03-20 10:01:36.657843073 +0100 -+++ good/etc/pam.d/systemd-user 2014-03-20 10:06:51.586121696 +0100 -@@ -4,5 +4,6 @@ - - account include system-auth - session include system-auth -+session required pam_systemd.so - auth required pam_deny.so - password required pam_deny.so -EOF - -# extra fix to avoid root and display sessions -patch -b -p1 -d/ <<'EOF' ---- bad/etc/pam.d/system-auth 2014-04-07 06:16:51.888018876 -0700 -+++ good/etc/pam.d/system-auth 2014-04-07 06:16:46.335018503 -0700 -@@ -11,7 +11,6 @@ - password required pam_deny.so - - session optional pam_keyinit.so revoke --session optional pam_systemd.so - session required pam_limits.so - session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid - session required pam_unix.so -EOF - -######### multiuser mode: create additional users +######### multiuser mode: create additional users and fix their homedirs tizen_crypted_pass=$(perl -e 'print crypt("tizen", "aa")') uid=5001 -for user in alice bob carol; do - useradd -u $uid -d /home/$user -g users -G audio,video,users,display -m --password "$tizen_crypted_pass" $user - uid=$(( $uid + 1 )) -done +for user in alice bob carol guest; do + if ! generic_base_user_exists $user; then + useradd -u $uid -d /home/$user -g users -G audio,video,users,display -m --password "$tizen_crypted_pass" $user + uid=$(( $uid + 1 )) + fi -# create appfw dirs inside homes -for user in alice bob carol app guest; do - for appdir in desktop manifest dbspace; do - mkdir -p /home/$user/.applications/$appdir - done - find /home/$user/ -type d -exec chsmack -a User {} \; - chown -R $user:users /home/$user/ + generic_base_fix_user_homedir $user done -# adjust app group: main group 'users', extra group 'app' -usermod -g users app -usermod -G app app + + diff --git a/scripts/common-bluetooth.post b/scripts/common-bluetooth.post deleted file mode 100644 index 6759999..0000000 --- a/scripts/common-bluetooth.post +++ /dev/null @@ -1,2 +0,0 @@ -############### common-bluetooth.post ################ - diff --git a/scripts/common-console-tools.post b/scripts/common-console-tools.post deleted file mode 100644 index 75cbba0..0000000 --- a/scripts/common-console-tools.post +++ /dev/null @@ -1,40 +0,0 @@ -##################### common-console-tools.post #################### - -# customize bash prompt -cat >/etc/profile.d/bash_prompt_custom.sh <<'EOF' -if [ "$PS1" ]; then - - 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}${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 get_manifest () { - rpm -qa --queryformat="%{name} %{Version} %{Release} %{VCS}\n" | sort - } -fi -EOF - diff --git a/scripts/common-crosswalk.post b/scripts/common-crosswalk.post index 793b49f..83b6f13 100644 --- a/scripts/common-crosswalk.post +++ b/scripts/common-crosswalk.post @@ -1,24 +1,6 @@ -############### common-crosswalk.post ################ +#!/bin/sh +echo "############### common-crosswalk.post ################" # start wrt widgets preinstall prepare_widgets.sh -# make crosswak start in default target -mkdir -p /lib/systemd/user/default.target.wants/ -ln -s ../xwalk.service /lib/systemd/user/default.target.wants/ - -# add launchers to weston.ini -if [ -f /usr/bin/weston ]; then - - cat >>/etc/xdg/weston/weston.ini <>/etc/xdg/weston/weston.ini <>/etc/xdg/weston/weston.ini < /etc/sysconfig/wrt <>/etc/xdg/weston/weston.ini <