summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-04-25 10:54:15 +0200
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-04-25 10:54:15 +0200
commitff5e0c3793c1f59857013a0f4693a6662a30ea9d (patch)
tree386577b9d877bc81ae82816683f0292f5fad80d7
parent800d619d6b9074edb58905768b20cf1d0a568758 (diff)
downloadmeta-ff5e0c3793c1f59857013a0f4693a6662a30ea9d.tar.gz
meta-ff5e0c3793c1f59857013a0f4693a6662a30ea9d.tar.bz2
meta-ff5e0c3793c1f59857013a0f4693a6662a30ea9d.zip
Change-Id: Ic21355d9ff483f046016b685b33854efb661eeee Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rw-r--r--common-repos.yaml8
-rw-r--r--common.yaml21
-rw-r--r--ks/common-qa-unsafe-x11-mbr-i586.yaml14
-rw-r--r--ks/common-qa-unsafe-x11-mbr-x86_64.yaml14
-rw-r--r--ks/common-x11-mbr-i586.yaml10
-rw-r--r--ks/common-x11-mbr-x86_64.yaml10
-rw-r--r--patterns/common-x11.yaml11
-rw-r--r--scripts/common-packaging.post6
-rw-r--r--scripts/common-x11.post5
9 files changed, 1 insertions, 98 deletions
diff --git a/common-repos.yaml b/common-repos.yaml
index 8275a5a..f63b37d 100644
--- a/common-repos.yaml
+++ b/common-repos.yaml
@@ -7,11 +7,3 @@ Repositories:
Url: http://download.tizen.org/snapshots/tizen/common/common-wayland-x86_64/@BUILD_ID@/repos/common/x86_64/packages/
Options: --ssl_verify=no
- - Name: common-x11_i586
- Url: http://download.tizen.org/snapshots/tizen/common/common-x11-ia32/@BUILD_ID@/repos/common/ia32/packages/
- Options: --ssl_verify=no
-
- - Name: common-x11_x86_64
- Url: http://download.tizen.org/snapshots/tizen/common/common-x11-x86_64/@BUILD_ID@/repos/common/x86_64/packages/
- Options: --ssl_verify=no
-
diff --git a/common.yaml b/common.yaml
index a55dcf2..7c921fd 100644
--- a/common.yaml
+++ b/common.yaml
@@ -55,24 +55,3 @@ Wayland:
- common-desktop-applications
- common-crosswalk
-X11:
- Part: common-mbr
- Groups:
- - Common X11
- - Common Adaptation
- - Common Middleware
- - Common Applications
- - Common Bluetooth
- - Common Multimedia
- - Common Webkit
- - Common Desktop Applications
- PostScripts:
- - common-x11
- - common-adaptation
- - common-middleware
- - common-applications
- - common-bluetooth
- - common-multimedia
- - common-webkit
- - common-desktop-applications
-
diff --git a/ks/common-qa-unsafe-x11-mbr-i586.yaml b/ks/common-qa-unsafe-x11-mbr-i586.yaml
deleted file mode 100644
index d2a2515..0000000
--- a/ks/common-qa-unsafe-x11-mbr-i586.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-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-x86-common
-Repos:
- - common-x11_i586
-Groups:
- - Common Automated QA Tools
-PostScripts:
- - common-autoqa
diff --git a/ks/common-qa-unsafe-x11-mbr-x86_64.yaml b/ks/common-qa-unsafe-x11-mbr-x86_64.yaml
deleted file mode 100644
index cb9214c..0000000
--- a/ks/common-qa-unsafe-x11-mbr-x86_64.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-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-x86-common
-Repos:
- - common-x11_x86_64
-Groups:
- - Common Automated QA Tools
-PostScripts:
- - common-autoqa
diff --git a/ks/common-x11-mbr-i586.yaml b/ks/common-x11-mbr-i586.yaml
deleted file mode 100644
index 601e510..0000000
--- a/ks/common-x11-mbr-i586.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-Name: Common X11 MBR i586
-Architecture: ia32
-Schedule: "*"
-Active: True
-Platform: X11
-Part: common-mbr
-FileName: common-x11-mbr-i586
-Kernel: kernel-x86-common
-Repos:
- - common-x11_i586
diff --git a/ks/common-x11-mbr-x86_64.yaml b/ks/common-x11-mbr-x86_64.yaml
deleted file mode 100644
index 0c18a0b..0000000
--- a/ks/common-x11-mbr-x86_64.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-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-x86-common
-Repos:
- - common-x11_x86_64
diff --git a/patterns/common-x11.yaml b/patterns/common-x11.yaml
deleted file mode 100644
index 93d81f9..0000000
--- a/patterns/common-x11.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-Summary: Common X11
-Description: Common X11
-Name: common-x11
-Packages:
-- xorg-server
-- xf86-input-synaptics
-- xf86-video-intel
-- xf86-input-keyboard
-- xorg-launch-helper
-- enlightenment
-- user-session-units
diff --git a/scripts/common-packaging.post b/scripts/common-packaging.post
index be7af54..338ce82 100644
--- a/scripts/common-packaging.post
+++ b/scripts/common-packaging.post
@@ -26,9 +26,5 @@ EOF
arch=ia32
[ -d /usr/lib64 ] && arch=x86_64
-if [ -x /usr/bin/weston ]; then
- genrepo common-wayland-${arch} http://download.tizen.org/snapshots/tizen/common/common-wayland-${arch}/latest/repos/common/${arch}/packages/
-else
- genrepo common-x11-${arch} http://download.tizen.org/snapshots/tizen/common/common-x11-${arch}/latest/repos/common/${arch}/packages/
-fi
+genrepo common-wayland-${arch} http://download.tizen.org/snapshots/tizen/common/common-wayland-${arch}/latest/repos/common/${arch}/packages/
diff --git a/scripts/common-x11.post b/scripts/common-x11.post
deleted file mode 100644
index c9e848e..0000000
--- a/scripts/common-x11.post
+++ /dev/null
@@ -1,5 +0,0 @@
-###################### common-x11.post ###################
-
-# enable X11 forwarding on ssh
-echo "X11Forwarding yes" >>/etc/ssh/sshd_config
-echo "AddressFamily inet" >>/etc/ssh/sshd_config