summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 17:25:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 00:29:30 +0100
commit6e95cb246f39e4d49d46761b9a7d51c858ac7e9d (patch)
tree1646acfdc315d3dfcc2516a6f49509ba7f633fae /meta/recipes-extended
parent4d609d502161137620c4b1901cc225f9e871c3dc (diff)
downloadpoky-6e95cb246f39e4d49d46761b9a7d51c858ac7e9d.tar.gz
Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb (renamed from meta/recipes-extended/images/poky-image-basic.bb)4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb (renamed from meta/recipes-extended/images/poky-image-lsb-dev.bb)4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-live.bb11
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk-live.bb11
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb (renamed from meta/recipes-extended/images/poky-image-lsb-sdk.bb)4
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb (renamed from meta/recipes-extended/images/poky-image-lsb.bb)4
-rw-r--r--meta/recipes-extended/images/poky-image-lsb-live.bb11
-rw-r--r--meta/recipes-extended/images/poky-image-lsb-sdk-live.bb11
-rw-r--r--meta/recipes-extended/libzypp/libzypp/config-release.patch4
-rw-r--r--meta/recipes-extended/tasks/task-core-basic.bb (renamed from meta/recipes-extended/tasks/task-poky-basic.bb)94
-rw-r--r--meta/recipes-extended/tasks/task-core-lsb.bb (renamed from meta/recipes-extended/tasks/task-poky-lsb.bb)100
11 files changed, 129 insertions, 129 deletions
diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 76d5dc2c7a..86972c3660 100644
--- a/meta/recipes-extended/images/poky-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,8 +1,8 @@
1IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 1IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 task-poky-boot \ 4 task-core-boot \
5 task-poky-basic \ 5 task-core-basic \
6 " 6 "
7 7
8# ${POKY_BASE_INSTALL} 8# ${POKY_BASE_INSTALL}
diff --git a/meta/recipes-extended/images/poky-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 578fbd0f06..86baf23de1 100644
--- a/meta/recipes-extended/images/poky-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \ 4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \ 5 task-core-basic \
6 task-poky-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit poky-image
diff --git a/meta/recipes-extended/images/core-image-lsb-live.bb b/meta/recipes-extended/images/core-image-lsb-live.bb
new file mode 100644
index 0000000000..72f10f78fe
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "LSB Bootable Live Image"
2
3require recipes-core/images/core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "core-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk-live.bb b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
new file mode 100644
index 0000000000..b01ae060f1
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "LSB SDK Bootable Live Image"
2
3require recipes-core/images/core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-sdk-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "core-image-lsb-sdk:do_rootfs"
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 967bb023d3..74ad1d2d8c 100644
--- a/meta/recipes-extended/images/poky-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkg
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \ 4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \ 5 task-core-basic \
6 task-poky-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 33532eac24..63180f5613 100644
--- a/meta/recipes-extended/images/poky-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \ 4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \ 5 task-core-basic \
6 task-poky-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb-live.bb b/meta/recipes-extended/images/poky-image-lsb-live.bb
deleted file mode 100644
index baa9ea0e4f..0000000000
--- a/meta/recipes-extended/images/poky-image-lsb-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "LSB Bootable Live Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "poky-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb b/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
deleted file mode 100644
index 370780a062..0000000000
--- a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "LSB SDK Bootable Live Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-sdk-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "poky-image-lsb-sdk:do_rootfs"
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
index 9128237755..e5963dfc3b 100644
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch
@@ -3,7 +3,7 @@ Configure distro version package
3We need to configure a package that the system can use to determine the 3We need to configure a package that the system can use to determine the
4system distribution version. 4system distribution version.
5 5
6Hack: for now set to task-poky-rpm. 6Hack: for now set to task-core-rpm.
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
@@ -15,7 +15,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
15 15
16 std::string ZConfig::distroverpkg() const 16 std::string ZConfig::distroverpkg() const
17- { return "redhat-release"; } 17- { return "redhat-release"; }
18+ { return "task-poky-rpm"; } 18+ { return "task-core-rpm"; }
19 19
20 /////////////////////////////////////////////////////////////////// 20 ///////////////////////////////////////////////////////////////////
21 21
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb
index 68c996dc88..e2a37d1160 100644
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-core-basic.bb
@@ -9,59 +9,59 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-basic \ 12 task-core-basic \
13 task-poky-base-utils \ 13 task-core-base-utils \
14 task-poky-base-utils-dbg \ 14 task-core-base-utils-dbg \
15 task-poky-base-utils-dev \ 15 task-core-base-utils-dev \
16 task-poky-basic-libs \ 16 task-core-basic-libs \
17 task-poky-basic-libs-dbg \ 17 task-core-basic-libs-dbg \
18 task-poky-basic-libs-dev \ 18 task-core-basic-libs-dev \
19 task-poky-basic-utils \ 19 task-core-basic-utils \
20 task-poky-basic-utils-dbg \ 20 task-core-basic-utils-dbg \
21 task-poky-basic-utils-dev \ 21 task-core-basic-utils-dev \
22 task-poky-basic-extended \ 22 task-core-basic-extended \
23 task-poky-basic-extended-dbg \ 23 task-core-basic-extended-dbg \
24 task-poky-basic-extended-dev \ 24 task-core-basic-extended-dev \
25 task-poky-dev-utils \ 25 task-core-dev-utils \
26 task-poky-dev-utils-dbg \ 26 task-core-dev-utils-dbg \
27 task-poky-dev-utils-dev \ 27 task-core-dev-utils-dev \
28 task-poky-multiuser \ 28 task-core-multiuser \
29 task-poky-multiuser-dbg \ 29 task-core-multiuser-dbg \
30 task-poky-multiuser-dev \ 30 task-core-multiuser-dev \
31 task-poky-initscripts \ 31 task-core-initscripts \
32 task-poky-initscripts-dbg \ 32 task-core-initscripts-dbg \
33 task-poky-initscripts-dev \ 33 task-core-initscripts-dev \
34 task-poky-rpm \ 34 task-core-rpm \
35 task-poky-rpm-dbg \ 35 task-core-rpm-dbg \
36 task-poky-rpm-dev \ 36 task-core-rpm-dev \
37 task-poky-sys-services \ 37 task-core-sys-services \
38 task-poky-sys-services-dbg \ 38 task-core-sys-services-dbg \
39 task-poky-sys-services-dev \ 39 task-core-sys-services-dev \
40 " 40 "
41 41
42ALLOW_EMPTY = "1" 42ALLOW_EMPTY = "1"
43 43
44RDEPENDS_task-poky-basic = "\ 44RDEPENDS_task-core-basic = "\
45 task-poky-base-utils \ 45 task-core-base-utils \
46 task-poky-basic-libs \ 46 task-core-basic-libs \
47 task-poky-basic-utils \ 47 task-core-basic-utils \
48 task-poky-basic-extended \ 48 task-core-basic-extended \
49 task-poky-dev-utils \ 49 task-core-dev-utils \
50 task-poky-multiuser \ 50 task-core-multiuser \
51 task-poky-initscripts \ 51 task-core-initscripts \
52 task-poky-rpm \ 52 task-core-rpm \
53 task-poky-sys-services \ 53 task-core-sys-services \
54 " 54 "
55 55
56RDEPENDS_task-poky-base-utils = "\ 56RDEPENDS_task-core-base-utils = "\
57 busybox \ 57 busybox \
58 " 58 "
59 59
60RDEPENDS_task-poky-basic-libs = "\ 60RDEPENDS_task-core-basic-libs = "\
61 glib-2.0 \ 61 glib-2.0 \
62 " 62 "
63 63
64RDEPENDS_task-poky-basic-utils = "\ 64RDEPENDS_task-core-basic-utils = "\
65 bash \ 65 bash \
66 acl \ 66 acl \
67 attr \ 67 attr \
@@ -92,7 +92,7 @@ RDEPENDS_task-poky-basic-utils = "\
92 zlib \ 92 zlib \
93 " 93 "
94 94
95RDEPENDS_task-poky-basic-extended = "\ 95RDEPENDS_task-core-basic-extended = "\
96 iproute2 \ 96 iproute2 \
97 iputils \ 97 iputils \
98 iptables \ 98 iptables \
@@ -100,7 +100,7 @@ RDEPENDS_task-poky-basic-extended = "\
100 openssl \ 100 openssl \
101 " 101 "
102 102
103RDEPENDS_task-poky-dev-utils = "\ 103RDEPENDS_task-core-dev-utils = "\
104 byacc \ 104 byacc \
105 diffutils \ 105 diffutils \
106 m4 \ 106 m4 \
@@ -108,7 +108,7 @@ RDEPENDS_task-poky-dev-utils = "\
108 patch \ 108 patch \
109 " 109 "
110 110
111RDEPENDS_task-poky-initscripts = "\ 111RDEPENDS_task-core-initscripts = "\
112 initscripts \ 112 initscripts \
113 sysvinit \ 113 sysvinit \
114 ethtool \ 114 ethtool \
@@ -116,7 +116,7 @@ RDEPENDS_task-poky-initscripts = "\
116 sysklogd \ 116 sysklogd \
117 " 117 "
118 118
119RDEPENDS_task-poky-multiuser = "\ 119RDEPENDS_task-core-multiuser = "\
120 cracklib \ 120 cracklib \
121 gzip \ 121 gzip \
122 libuser \ 122 libuser \
@@ -125,13 +125,13 @@ RDEPENDS_task-poky-multiuser = "\
125 sudo \ 125 sudo \
126 " 126 "
127 127
128RDEPENDS_task-poky-rpm = "\ 128RDEPENDS_task-core-rpm = "\
129 beecrypt \ 129 beecrypt \
130 rpm \ 130 rpm \
131 zypper \ 131 zypper \
132 " 132 "
133 133
134RDEPENDS_task-poky-sys-services = "\ 134RDEPENDS_task-core-sys-services = "\
135 at \ 135 at \
136 bzip2 \ 136 bzip2 \
137 cronie \ 137 cronie \
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index b56c07beb2..ef8acb1359 100644
--- a/meta/recipes-extended/tasks/task-poky-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -9,50 +9,50 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-lsb \ 12 task-core-lsb \
13 task-poky-sys-extended \ 13 task-core-sys-extended \
14 task-poky-sys-extended-dbg \ 14 task-core-sys-extended-dbg \
15 task-poky-sys-extended-dev \ 15 task-core-sys-extended-dev \
16 task-poky-db \ 16 task-core-db \
17 task-poky-db-dbg \ 17 task-core-db-dbg \
18 task-poky-db-dev \ 18 task-core-db-dev \
19 task-poky-misc \ 19 task-core-misc \
20 task-poky-misc-dbg \ 20 task-core-misc-dbg \
21 task-poky-misc-dev \ 21 task-core-misc-dev \
22 task-poky-perl \ 22 task-core-perl \
23 task-poky-perl-dbg \ 23 task-core-perl-dbg \
24 task-poky-perl-dev \ 24 task-core-perl-dev \
25 task-poky-python \ 25 task-core-python \
26 task-poky-python-dbg \ 26 task-core-python-dbg \
27 task-poky-python-dev \ 27 task-core-python-dev \
28 task-poky-tcl \ 28 task-core-tcl \
29 task-poky-tcl-dbg \ 29 task-core-tcl-dbg \
30 task-poky-tcl-dev \ 30 task-core-tcl-dev \
31 task-poky-lsb-perl-add \ 31 task-core-lsb-perl-add \
32 task-poky-lsb-python-add \ 32 task-core-lsb-python-add \
33 task-poky-lsb-graphic-add \ 33 task-core-lsb-graphic-add \
34 task-poky-lsb-runtime-add \ 34 task-core-lsb-runtime-add \
35 task-poky-lsb-command-add \ 35 task-core-lsb-command-add \
36 " 36 "
37 37
38 38
39ALLOW_EMPTY = "1" 39ALLOW_EMPTY = "1"
40 40
41RDEPENDS_task-poky-lsb = "\ 41RDEPENDS_task-core-lsb = "\
42 task-poky-sys-extended \ 42 task-core-sys-extended \
43 task-poky-db \ 43 task-core-db \
44 task-poky-misc \ 44 task-core-misc \
45 task-poky-perl \ 45 task-core-perl \
46 task-poky-python \ 46 task-core-python \
47 task-poky-tcl \ 47 task-core-tcl \
48 task-poky-lsb-perl-add \ 48 task-core-lsb-perl-add \
49 task-poky-lsb-python-add \ 49 task-core-lsb-python-add \
50 task-poky-lsb-graphic-add \ 50 task-core-lsb-graphic-add \
51 task-poky-lsb-runtime-add \ 51 task-core-lsb-runtime-add \
52 task-poky-lsb-command-add \ 52 task-core-lsb-command-add \
53 " 53 "
54 54
55RDEPENDS_task-poky-sys-extended = "\ 55RDEPENDS_task-core-sys-extended = "\
56 binutils \ 56 binutils \
57 chkconfig \ 57 chkconfig \
58 curl \ 58 curl \
@@ -81,19 +81,19 @@ RDEPENDS_task-poky-sys-extended = "\
81 zip \ 81 zip \
82 " 82 "
83 83
84RDEPENDS_task-poky-db = "\ 84RDEPENDS_task-core-db = "\
85 db \ 85 db \
86 sqlite3 \ 86 sqlite3 \
87 " 87 "
88 88
89RDEPENDS_task-poky-perl = "\ 89RDEPENDS_task-core-perl = "\
90 gdbm \ 90 gdbm \
91 perl \ 91 perl \
92 zlib \ 92 zlib \
93 " 93 "
94 94
95 95
96RDEPENDS_task-poky-python = "\ 96RDEPENDS_task-core-python = "\
97 expat \ 97 expat \
98 gdbm \ 98 gdbm \
99 gmp \ 99 gmp \
@@ -104,11 +104,11 @@ RDEPENDS_task-poky-python = "\
104 zip \ 104 zip \
105 " 105 "
106 106
107RDEPENDS_task-poky-tcl = "\ 107RDEPENDS_task-core-tcl = "\
108 tcl \ 108 tcl \
109 " 109 "
110 110
111RDEPENDS_task-poky-misc = "\ 111RDEPENDS_task-core-misc = "\
112 elfutils \ 112 elfutils \
113 gettext \ 113 gettext \
114 groff \ 114 groff \
@@ -124,7 +124,7 @@ RDEPENDS_task-poky-misc = "\
124 zlib \ 124 zlib \
125 " 125 "
126 126
127RDEPENDS_task-poky-lsb-command-add = "\ 127RDEPENDS_task-core-lsb-command-add = "\
128 localedef \ 128 localedef \
129 fontconfig-utils \ 129 fontconfig-utils \
130 mailx \ 130 mailx \
@@ -133,19 +133,19 @@ RDEPENDS_task-poky-lsb-command-add = "\
133" 133"
134# cups 134# cups
135 135
136RDEPENDS_task-poky-lsb-perl-add = "\ 136RDEPENDS_task-core-lsb-perl-add = "\
137 perl-modules \ 137 perl-modules \
138 perl-dev \ 138 perl-dev \
139 perl-misc \ 139 perl-misc \
140 perl-pod \ 140 perl-pod \
141" 141"
142 142
143RDEPENDS_task-poky-lsb-python-add = "\ 143RDEPENDS_task-core-lsb-python-add = "\
144 python-modules \ 144 python-modules \
145 python-misc \ 145 python-misc \
146" 146"
147 147
148RDEPENDS_task-poky-lsb-graphic-add = "\ 148RDEPENDS_task-core-lsb-graphic-add = "\
149 libqtcore4 \ 149 libqtcore4 \
150 libqtgui4 \ 150 libqtgui4 \
151 libqtsql4 \ 151 libqtsql4 \
@@ -166,19 +166,19 @@ RDEPENDS_task-poky-lsb-graphic-add = "\
166 gdk-pixbuf-loader-ani \ 166 gdk-pixbuf-loader-ani \
167" 167"
168 168
169RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\ 169RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\
170 libqtopengl4 \ 170 libqtopengl4 \
171" 171"
172RDEPENDS_task-poky-lsb-graphic-add_atom-pc = "\ 172RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\
173 libqtopengl4 \ 173 libqtopengl4 \
174" 174"
175RDEPENDS_task-poky-lsb-graphic-add_qemuppc = "\ 175RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\
176 libqtopengl4 \ 176 libqtopengl4 \
177" 177"
178 178
179# mesa-dri 179# mesa-dri
180 180
181RDEPENDS_task-poky-lsb-runtime-add = "\ 181RDEPENDS_task-core-lsb-runtime-add = "\
182 ldd \ 182 ldd \
183 pam-plugin-wheel \ 183 pam-plugin-wheel \
184 e2fsprogs-mke2fs \ 184 e2fsprogs-mke2fs \