summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb4
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb4
-rw-r--r--meta/recipes-extended/libzypp/libzypp/config-release.patch4
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-basic.bb156
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb (renamed from meta/recipes-extended/tasks/task-core-lsb.bb)94
-rw-r--r--meta/recipes-extended/tasks/task-core-basic.bb156
8 files changed, 213 insertions, 213 deletions
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index f801346376..9aa880ec4f 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -4,8 +4,8 @@ reasonably used for customization."
4IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 4IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
5 5
6IMAGE_INSTALL = "\ 6IMAGE_INSTALL = "\
7 task-core-boot \ 7 packagegroup-core-boot \
8 task-core-basic \ 8 packagegroup-core-basic \
9 " 9 "
10 10
11# ${CORE_IMAGE_BASE_INSTALL} 11# ${CORE_IMAGE_BASE_INSTALL}
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 3bb78003af..557259b1b6 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
9 task-core-basic \ 9 packagegroup-core-basic \
10 task-core-lsb \ 10 packagegroup-core-lsb \
11 " 11 "
12 12
13inherit core-image 13inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 7601410828..d07f90d527 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -8,8 +8,8 @@ IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
8 8
9IMAGE_INSTALL = "\ 9IMAGE_INSTALL = "\
10 ${CORE_IMAGE_BASE_INSTALL} \ 10 ${CORE_IMAGE_BASE_INSTALL} \
11 task-core-basic \ 11 packagegroup-core-basic \
12 task-core-lsb \ 12 packagegroup-core-lsb \
13 kernel-dev \ 13 kernel-dev \
14 " 14 "
15 15
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index b370d49c58..8435596da1 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
9 task-core-basic \ 9 packagegroup-core-basic \
10 task-core-lsb \ 10 packagegroup-core-lsb \
11 " 11 "
12 12
13inherit core-image 13inherit core-image
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
index b4e7ab02fb..26c7307deb 100644
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch
@@ -5,7 +5,7 @@ Configure distro version package
5We need to configure a package that the system can use to determine the 5We need to configure a package that the system can use to determine the
6system distribution version. 6system distribution version.
7 7
8Hack: for now set to task-core-rpm. 8Hack: for now set to packagegroup-core-rpm.
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
@@ -17,7 +17,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
17 17
18 std::string ZConfig::distroverpkg() const 18 std::string ZConfig::distroverpkg() const
19- { return "redhat-release"; } 19- { return "redhat-release"; }
20+ { return "task-core-rpm"; } 20+ { return "packagegroup-core-rpm"; }
21 21
22 /////////////////////////////////////////////////////////////////// 22 ///////////////////////////////////////////////////////////////////
23 23
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
new file mode 100644
index 0000000000..a7e3eb75c5
--- /dev/null
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -0,0 +1,156 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5DESCRIPTION = "Create Basic Image Tasks"
6PR = "r4"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10
11PACKAGES = "\
12 packagegroup-core-basic \
13 packagegroup-core-base-utils \
14 packagegroup-core-base-utils-dbg \
15 packagegroup-core-base-utils-dev \
16 packagegroup-core-basic-libs \
17 packagegroup-core-basic-libs-dbg \
18 packagegroup-core-basic-libs-dev \
19 packagegroup-core-basic-utils \
20 packagegroup-core-basic-utils-dbg \
21 packagegroup-core-basic-utils-dev \
22 packagegroup-core-basic-extended \
23 packagegroup-core-basic-extended-dbg \
24 packagegroup-core-basic-extended-dev \
25 packagegroup-core-dev-utils \
26 packagegroup-core-dev-utils-dbg \
27 packagegroup-core-dev-utils-dev \
28 packagegroup-core-multiuser \
29 packagegroup-core-multiuser-dbg \
30 packagegroup-core-multiuser-dev \
31 packagegroup-core-initscripts \
32 packagegroup-core-initscripts-dbg \
33 packagegroup-core-initscripts-dev \
34 packagegroup-core-rpm \
35 packagegroup-core-rpm-dbg \
36 packagegroup-core-rpm-dev \
37 packagegroup-core-sys-services \
38 packagegroup-core-sys-services-dbg \
39 packagegroup-core-sys-services-dev \
40 "
41
42ALLOW_EMPTY = "1"
43
44RDEPENDS_packagegroup-core-basic = "\
45 packagegroup-core-base-utils \
46 packagegroup-core-basic-libs \
47 packagegroup-core-basic-utils \
48 packagegroup-core-basic-extended \
49 packagegroup-core-dev-utils \
50 packagegroup-core-multiuser \
51 packagegroup-core-initscripts \
52 packagegroup-core-rpm \
53 packagegroup-core-sys-services \
54 "
55
56RDEPENDS_packagegroup-core-base-utils = "\
57 busybox \
58 "
59
60RDEPENDS_packagegroup-core-basic-libs = "\
61 glib-2.0 \
62 "
63
64RDEPENDS_packagegroup-core-basic-utils = "\
65 bash \
66 acl \
67 attr \
68 bc \
69 coreutils \
70 cpio \
71 e2fsprogs \
72 ed \
73 file \
74 findutils \
75 gawk \
76 gmp \
77 grep \
78 makedevs \
79 mc \
80 mktemp \
81 ncurses \
82 net-tools \
83 pax \
84 popt \
85 procps \
86 psmisc \
87 sed \
88 tar \
89 time \
90 udev \
91 util-linux \
92 zlib \
93 "
94
95RDEPENDS_packagegroup-core-basic-extended = "\
96 iproute2 \
97 iputils \
98 iptables \
99 module-init-tools \
100 openssl \
101 "
102
103RDEPENDS_packagegroup-core-dev-utils = "\
104 byacc \
105 diffutils \
106 m4 \
107 make \
108 patch \
109 "
110
111RDEPENDS_packagegroup-core-initscripts = "\
112 initscripts \
113 sysvinit \
114 ethtool \
115 mingetty \
116 sysklogd \
117 "
118
119RDEPENDS_packagegroup-core-multiuser = "\
120 cracklib \
121 gzip \
122 libuser \
123 libpam \
124 shadow \
125 sudo \
126 "
127
128RDEPENDS_packagegroup-core-rpm = "\
129 beecrypt \
130 rpm \
131 zypper \
132 "
133
134RDEPENDS_packagegroup-core-sys-services = "\
135 at \
136 bzip2 \
137 cronie \
138 dbus \
139 dbus-glib \
140 python-dbus \
141 elfutils \
142 gzip \
143 less \
144 libcap \
145 libevent \
146 lighttpd \
147 logrotate \
148 nfs-utils \
149 pciutils \
150 libpcre \
151 rpcbind \
152 sysfsutils \
153 tcp-wrappers \
154 tzdata \
155 "
156
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index be9eac2954..984ed36940 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-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-core-lsb \ 12 packagegroup-core-lsb \
13 task-core-sys-extended \ 13 packagegroup-core-sys-extended \
14 task-core-sys-extended-dbg \ 14 packagegroup-core-sys-extended-dbg \
15 task-core-sys-extended-dev \ 15 packagegroup-core-sys-extended-dev \
16 task-core-db \ 16 packagegroup-core-db \
17 task-core-db-dbg \ 17 packagegroup-core-db-dbg \
18 task-core-db-dev \ 18 packagegroup-core-db-dev \
19 task-core-misc \ 19 packagegroup-core-misc \
20 task-core-misc-dbg \ 20 packagegroup-core-misc-dbg \
21 task-core-misc-dev \ 21 packagegroup-core-misc-dev \
22 task-core-perl \ 22 packagegroup-core-perl \
23 task-core-perl-dbg \ 23 packagegroup-core-perl-dbg \
24 task-core-perl-dev \ 24 packagegroup-core-perl-dev \
25 task-core-python \ 25 packagegroup-core-python \
26 task-core-python-dbg \ 26 packagegroup-core-python-dbg \
27 task-core-python-dev \ 27 packagegroup-core-python-dev \
28 task-core-tcl \ 28 packagegroup-core-tcl \
29 task-core-tcl-dbg \ 29 packagegroup-core-tcl-dbg \
30 task-core-tcl-dev \ 30 packagegroup-core-tcl-dev \
31 task-core-lsb-perl-add \ 31 packagegroup-core-lsb-perl-add \
32 task-core-lsb-python-add \ 32 packagegroup-core-lsb-python-add \
33 task-core-lsb-graphic-add \ 33 packagegroup-core-lsb-graphic-add \
34 task-core-lsb-runtime-add \ 34 packagegroup-core-lsb-runtime-add \
35 task-core-lsb-command-add \ 35 packagegroup-core-lsb-command-add \
36 " 36 "
37 37
38 38
39ALLOW_EMPTY = "1" 39ALLOW_EMPTY = "1"
40 40
41RDEPENDS_task-core-lsb = "\ 41RDEPENDS_packagegroup-core-lsb = "\
42 task-core-sys-extended \ 42 packagegroup-core-sys-extended \
43 task-core-db \ 43 packagegroup-core-db \
44 task-core-misc \ 44 packagegroup-core-misc \
45 task-core-perl \ 45 packagegroup-core-perl \
46 task-core-python \ 46 packagegroup-core-python \
47 task-core-tcl \ 47 packagegroup-core-tcl \
48 task-core-lsb-perl-add \ 48 packagegroup-core-lsb-perl-add \
49 task-core-lsb-python-add \ 49 packagegroup-core-lsb-python-add \
50 task-core-lsb-graphic-add \ 50 packagegroup-core-lsb-graphic-add \
51 task-core-lsb-runtime-add \ 51 packagegroup-core-lsb-runtime-add \
52 task-core-lsb-command-add \ 52 packagegroup-core-lsb-command-add \
53 " 53 "
54 54
55RDEPENDS_task-core-sys-extended = "\ 55RDEPENDS_packagegroup-core-sys-extended = "\
56 binutils \ 56 binutils \
57 binutils-symlinks \ 57 binutils-symlinks \
58 chkconfig \ 58 chkconfig \
@@ -83,19 +83,19 @@ RDEPENDS_task-core-sys-extended = "\
83 lsbinitscripts \ 83 lsbinitscripts \
84 " 84 "
85 85
86RDEPENDS_task-core-db = "\ 86RDEPENDS_packagegroup-core-db = "\
87 db \ 87 db \
88 sqlite3 \ 88 sqlite3 \
89 " 89 "
90 90
91RDEPENDS_task-core-perl = "\ 91RDEPENDS_packagegroup-core-perl = "\
92 gdbm \ 92 gdbm \
93 perl \ 93 perl \
94 zlib \ 94 zlib \
95 " 95 "
96 96
97 97
98RDEPENDS_task-core-python = "\ 98RDEPENDS_packagegroup-core-python = "\
99 expat \ 99 expat \
100 gdbm \ 100 gdbm \
101 gmp \ 101 gmp \
@@ -106,11 +106,11 @@ RDEPENDS_task-core-python = "\
106 zip \ 106 zip \
107 " 107 "
108 108
109RDEPENDS_task-core-tcl = "\ 109RDEPENDS_packagegroup-core-tcl = "\
110 tcl \ 110 tcl \
111 " 111 "
112 112
113RDEPENDS_task-core-misc = "\ 113RDEPENDS_packagegroup-core-misc = "\
114 elfutils \ 114 elfutils \
115 gettext \ 115 gettext \
116 gettext-runtime \ 116 gettext-runtime \
@@ -128,7 +128,7 @@ RDEPENDS_task-core-misc = "\
128 zlib \ 128 zlib \
129 " 129 "
130 130
131RDEPENDS_task-core-lsb-command-add = "\ 131RDEPENDS_packagegroup-core-lsb-command-add = "\
132 localedef \ 132 localedef \
133 fontconfig-utils \ 133 fontconfig-utils \
134 mailx \ 134 mailx \
@@ -140,18 +140,18 @@ RDEPENDS_task-core-lsb-command-add = "\
140 ghostscript \ 140 ghostscript \
141" 141"
142 142
143RDEPENDS_task-core-lsb-perl-add = "\ 143RDEPENDS_packagegroup-core-lsb-perl-add = "\
144 perl-modules \ 144 perl-modules \
145 perl-misc \ 145 perl-misc \
146 perl-pod \ 146 perl-pod \
147" 147"
148 148
149RDEPENDS_task-core-lsb-python-add = "\ 149RDEPENDS_packagegroup-core-lsb-python-add = "\
150 python-modules \ 150 python-modules \
151 python-misc \ 151 python-misc \
152" 152"
153 153
154RDEPENDS_task-core-lsb-graphic-add = "\ 154RDEPENDS_packagegroup-core-lsb-graphic-add = "\
155 libqtcore4 \ 155 libqtcore4 \
156 libqtgui4 \ 156 libqtgui4 \
157 libqtsql4 \ 157 libqtsql4 \
@@ -178,7 +178,7 @@ RDEPENDS_task-core-lsb-graphic-add = "\
178 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ 178 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
179" 179"
180 180
181RDEPENDS_task-core-lsb-runtime-add = "\ 181RDEPENDS_packagegroup-core-lsb-runtime-add = "\
182 ldd \ 182 ldd \
183 pam-plugin-wheel \ 183 pam-plugin-wheel \
184 e2fsprogs-mke2fs \ 184 e2fsprogs-mke2fs \
diff --git a/meta/recipes-extended/tasks/task-core-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb
deleted file mode 100644
index a810d3785b..0000000000
--- a/meta/recipes-extended/tasks/task-core-basic.bb
+++ /dev/null
@@ -1,156 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5DESCRIPTION = "Create Basic Image Tasks"
6PR = "r4"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10
11PACKAGES = "\
12 task-core-basic \
13 task-core-base-utils \
14 task-core-base-utils-dbg \
15 task-core-base-utils-dev \
16 task-core-basic-libs \
17 task-core-basic-libs-dbg \
18 task-core-basic-libs-dev \
19 task-core-basic-utils \
20 task-core-basic-utils-dbg \
21 task-core-basic-utils-dev \
22 task-core-basic-extended \
23 task-core-basic-extended-dbg \
24 task-core-basic-extended-dev \
25 task-core-dev-utils \
26 task-core-dev-utils-dbg \
27 task-core-dev-utils-dev \
28 task-core-multiuser \
29 task-core-multiuser-dbg \
30 task-core-multiuser-dev \
31 task-core-initscripts \
32 task-core-initscripts-dbg \
33 task-core-initscripts-dev \
34 task-core-rpm \
35 task-core-rpm-dbg \
36 task-core-rpm-dev \
37 task-core-sys-services \
38 task-core-sys-services-dbg \
39 task-core-sys-services-dev \
40 "
41
42ALLOW_EMPTY = "1"
43
44RDEPENDS_task-core-basic = "\
45 task-core-base-utils \
46 task-core-basic-libs \
47 task-core-basic-utils \
48 task-core-basic-extended \
49 task-core-dev-utils \
50 task-core-multiuser \
51 task-core-initscripts \
52 task-core-rpm \
53 task-core-sys-services \
54 "
55
56RDEPENDS_task-core-base-utils = "\
57 busybox \
58 "
59
60RDEPENDS_task-core-basic-libs = "\
61 glib-2.0 \
62 "
63
64RDEPENDS_task-core-basic-utils = "\
65 bash \
66 acl \
67 attr \
68 bc \
69 coreutils \
70 cpio \
71 e2fsprogs \
72 ed \
73 file \
74 findutils \
75 gawk \
76 gmp \
77 grep \
78 makedevs \
79 mc \
80 mktemp \
81 ncurses \
82 net-tools \
83 pax \
84 popt \
85 procps \
86 psmisc \
87 sed \
88 tar \
89 time \
90 udev \
91 util-linux \
92 zlib \
93 "
94
95RDEPENDS_task-core-basic-extended = "\
96 iproute2 \
97 iputils \
98 iptables \
99 module-init-tools \
100 openssl \
101 "
102
103RDEPENDS_task-core-dev-utils = "\
104 byacc \
105 diffutils \
106 m4 \
107 make \
108 patch \
109 "
110
111RDEPENDS_task-core-initscripts = "\
112 initscripts \
113 sysvinit \
114 ethtool \
115 mingetty \
116 sysklogd \
117 "
118
119RDEPENDS_task-core-multiuser = "\
120 cracklib \
121 gzip \
122 libuser \
123 libpam \
124 shadow \
125 sudo \
126 "
127
128RDEPENDS_task-core-rpm = "\
129 beecrypt \
130 rpm \
131 zypper \
132 "
133
134RDEPENDS_task-core-sys-services = "\
135 at \
136 bzip2 \
137 cronie \
138 dbus \
139 dbus-glib \
140 python-dbus \
141 elfutils \
142 gzip \
143 less \
144 libcap \
145 libevent \
146 lighttpd \
147 logrotate \
148 nfs-utils \
149 pciutils \
150 libpcre \
151 rpcbind \
152 sysfsutils \
153 tcp-wrappers \
154 tzdata \
155 "
156
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-10 20:29:09 +0000