summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-06 16:46:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:45:21 +0000
commit91c372f287732cdedbd7c1204c6ba5f34e5b93f6 (patch)
treec088d751fdbaed6e10c58f92aa8890848c225458
parent2f9bf7bc97cb832f4db13df62ce09d96ce75e810 (diff)
downloadpoky-91c372f287732cdedbd7c1204c6ba5f34e5b93f6.tar.gz
core-image-basic / packagegroup-core-basic: rename to *-full-cmdline
This more accurately represents what this image and packagegroup are intended to provide (a more complete command-line environment similar to what you would find on a traditional Linux system), and avoids confusion with the similarly named core-image-base and packagegroup-base. Fixes [YOCTO #2424]. (From OE-Core rev: 959396d5319df6d6599cc74077e85182768b92af) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/lib/oeqa/selftest/bbtests.py2
-rw-r--r--meta/recipes-extended/images/core-image-full-cmdline.bb (renamed from meta/recipes-extended/images/core-image-basic.bb)2
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb2
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-basic.bb138
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb163
-rw-r--r--meta/recipes-graphics/images/core-image-directfb.bb2
6 files changed, 167 insertions, 142 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index 7ca0802428..ee1f82a217 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -68,7 +68,7 @@ class BitbakeTests(oeSelfTest):
68 self.assertTrue(find_task) 68 self.assertTrue(find_task)
69 69
70 def test_bitbake_g(self): 70 def test_bitbake_g(self):
71 result = bitbake('-g core-image-basic') 71 result = bitbake('-g core-image-full-cmdline')
72 self.assertTrue('NOTE: PN build list saved to \'pn-buildlist\'' in result.output) 72 self.assertTrue('NOTE: PN build list saved to \'pn-buildlist\'' in result.output)
73 self.assertTrue('openssh' in ftools.read_file(os.path.join(self.builddir, 'pn-buildlist'))) 73 self.assertTrue('openssh' in ftools.read_file(os.path.join(self.builddir, 'pn-buildlist')))
74 for f in ['pn-buildlist', 'pn-depends.dot', 'package-depends.dot', 'task-depends.dot']: 74 for f in ['pn-buildlist', 'pn-depends.dot', 'package-depends.dot', 'task-depends.dot']:
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-full-cmdline.bb
index d599e720f1..4d69073d9d 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-full-cmdline.bb
@@ -5,7 +5,7 @@ IMAGE_FEATURES += "splash ssh-server-openssh"
5 5
6IMAGE_INSTALL = "\ 6IMAGE_INSTALL = "\
7 packagegroup-core-boot \ 7 packagegroup-core-boot \
8 packagegroup-core-basic \ 8 packagegroup-core-full-cmdline \
9 ${CORE_IMAGE_EXTRA_INSTALL} \ 9 ${CORE_IMAGE_EXTRA_INSTALL} \
10 " 10 "
11 11
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 1ef7f11742..ed316a64e7 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -5,7 +5,7 @@ IMAGE_FEATURES += "splash ssh-server-openssh hwcodecs package-management"
5 5
6IMAGE_INSTALL = "\ 6IMAGE_INSTALL = "\
7 ${CORE_IMAGE_BASE_INSTALL} \ 7 ${CORE_IMAGE_BASE_INSTALL} \
8 packagegroup-core-basic \ 8 packagegroup-core-full-cmdline \
9 packagegroup-core-lsb \ 9 packagegroup-core-lsb \
10 " 10 "
11 11
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
deleted file mode 100644
index f3b4ff7f0b..0000000000
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ /dev/null
@@ -1,138 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5SUMMARY = "Create Basic Image Tasks"
6PR = "r6"
7LICENSE = "MIT"
8
9inherit packagegroup
10
11PACKAGES = "\
12 packagegroup-core-basic \
13 packagegroup-core-basic-libs \
14 packagegroup-core-basic-utils \
15 packagegroup-core-basic-extended \
16 packagegroup-core-dev-utils \
17 packagegroup-core-multiuser \
18 packagegroup-core-initscripts \
19 packagegroup-core-sys-services \
20 "
21
22python __anonymous () {
23 # For backwards compatibility after rename
24 packages = d.getVar("PACKAGES", True).split()
25 for pkg in packages:
26 d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
27 d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
28 d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
29}
30
31
32RDEPENDS_packagegroup-core-basic = "\
33 packagegroup-core-basic-libs \
34 packagegroup-core-basic-utils \
35 packagegroup-core-basic-extended \
36 packagegroup-core-dev-utils \
37 packagegroup-core-multiuser \
38 packagegroup-core-initscripts \
39 packagegroup-core-sys-services \
40 "
41
42RDEPENDS_packagegroup-core-basic-libs = "\
43 glib-2.0 \
44 "
45
46RDEPENDS_packagegroup-core-basic-utils = "\
47 bash \
48 acl \
49 attr \
50 bc \
51 coreutils \
52 cpio \
53 e2fsprogs \
54 ed \
55 file \
56 findutils \
57 gawk \
58 gmp \
59 grep \
60 makedevs \
61 mc \
62 mc-fish \
63 mc-helpers \
64 mc-helpers-perl \
65 mc-helpers-python \
66 mktemp \
67 ncurses \
68 net-tools \
69 pax \
70 popt \
71 procps \
72 psmisc \
73 sed \
74 tar \
75 time \
76 util-linux \
77 zlib \
78 "
79
80RDEPENDS_packagegroup-core-basic-extended = "\
81 iproute2 \
82 iputils \
83 iptables \
84 module-init-tools \
85 openssl \
86 "
87
88RDEPENDS_packagegroup-core-dev-utils = "\
89 byacc \
90 diffutils \
91 m4 \
92 make \
93 patch \
94 "
95
96VIRTUAL-RUNTIME_initscripts ?= "initscripts"
97VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
98VIRTUAL-RUNTIME_login_manager ?= "busybox"
99VIRTUAL-RUNTIME_syslog ?= "sysklogd"
100RDEPENDS_packagegroup-core-initscripts = "\
101 ${VIRTUAL-RUNTIME_initscripts} \
102 ${VIRTUAL-RUNTIME_init_manager} \
103 ethtool \
104 ${VIRTUAL-RUNTIME_login_manager} \
105 ${VIRTUAL-RUNTIME_syslog} \
106 "
107
108RDEPENDS_packagegroup-core-multiuser = "\
109 cracklib \
110 gzip \
111 ${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
112 shadow \
113 sudo \
114 "
115
116RDEPENDS_packagegroup-core-sys-services = "\
117 at \
118 bzip2 \
119 cronie \
120 dbus \
121 dbus-glib \
122 python-dbus \
123 elfutils \
124 gzip \
125 less \
126 libcap \
127 libevent \
128 lighttpd \
129 logrotate \
130 nfs-utils \
131 pciutils \
132 libpcre \
133 rpcbind \
134 sysfsutils \
135 tcp-wrappers \
136 tzdata \
137 "
138
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
new file mode 100644
index 0000000000..b87213cb99
--- /dev/null
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -0,0 +1,163 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5SUMMARY = "Standard full-featured Linux system"
6DESCRIPTION = "Package group bringing in packages needed for a more traditional full-featured Linux system"
7PR = "r6"
8LICENSE = "MIT"
9
10inherit packagegroup
11
12PACKAGES = "\
13 packagegroup-core-full-cmdline \
14 packagegroup-core-full-cmdline-libs \
15 packagegroup-core-full-cmdline-utils \
16 packagegroup-core-full-cmdline-extended \
17 packagegroup-core-full-cmdline-dev-utils \
18 packagegroup-core-full-cmdline-multiuser \
19 packagegroup-core-full-cmdline-initscripts \
20 packagegroup-core-full-cmdline-sys-services \
21 "
22
23python __anonymous () {
24 # For backwards compatibility after rename
25 namemap = {}
26 namemap["packagegroup-core-full-cmdline"] = "packagegroup-core-basic"
27 namemap["packagegroup-core-full-cmdline-libs"] = "packagegroup-core-basic-libs"
28 namemap["packagegroup-core-full-cmdline-utils"] = "packagegroup-core-basic-utils"
29 namemap["packagegroup-core-full-cmdline-extended"] = "packagegroup-core-basic-extended"
30 namemap["packagegroup-core-full-cmdline-dev-utils"] = "packagegroup-core-dev-utils"
31 namemap["packagegroup-core-full-cmdline-multiuser"] = "packagegroup-core-multiuser"
32 namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts"
33 namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services"
34
35 packages = d.getVar("PACKAGES", True).split()
36 for pkg in packages:
37 if pkg.endswith('-dev'):
38 mapped = namemap.get(pkg[:-4], None)
39 if mapped:
40 mapped += '-dev'
41 elif pkg.endswith('-dbg'):
42 mapped = namemap.get(pkg[:-4], None)
43 if mapped:
44 mapped += '-dbg'
45 else:
46 mapped = namemap.get(pkg, None)
47
48 if mapped:
49 oldtaskname = mapped.replace("packagegroup-core", "task-core")
50 mapstr = " %s %s" % (mapped, oldtaskname)
51 d.appendVar("RPROVIDES_%s" % pkg, mapstr)
52 d.appendVar("RREPLACES_%s" % pkg, mapstr)
53 d.appendVar("RCONFLICTS_%s" % pkg, mapstr)
54}
55
56
57RDEPENDS_packagegroup-core-full-cmdline = "\
58 packagegroup-core-full-cmdline-libs \
59 packagegroup-core-full-cmdline-utils \
60 packagegroup-core-full-cmdline-extended \
61 packagegroup-core-full-cmdline-dev-utils \
62 packagegroup-core-full-cmdline-multiuser \
63 packagegroup-core-full-cmdline-initscripts \
64 packagegroup-core-full-cmdline-sys-services \
65 "
66
67RDEPENDS_packagegroup-core-full-cmdline-libs = "\
68 glib-2.0 \
69 "
70
71RDEPENDS_packagegroup-core-full-cmdline-utils = "\
72 bash \
73 acl \
74 attr \
75 bc \
76 coreutils \
77 cpio \
78 e2fsprogs \
79 ed \
80 file \
81 findutils \
82 gawk \
83 gmp \
84 grep \
85 makedevs \
86 mc \
87 mc-fish \
88 mc-helpers \
89 mc-helpers-perl \
90 mc-helpers-python \
91 mktemp \
92 ncurses \
93 net-tools \
94 pax \
95 popt \
96 procps \
97 psmisc \
98 sed \
99 tar \
100 time \
101 util-linux \
102 zlib \
103 "
104
105RDEPENDS_packagegroup-core-full-cmdline-extended = "\
106 iproute2 \
107 iputils \
108 iptables \
109 module-init-tools \
110 openssl \
111 "
112
113RDEPENDS_packagegroup-core-full-cmdline-dev-utils = "\
114 byacc \
115 diffutils \
116 m4 \
117 make \
118 patch \
119 "
120
121VIRTUAL-RUNTIME_initscripts ?= "initscripts"
122VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
123VIRTUAL-RUNTIME_login_manager ?= "busybox"
124VIRTUAL-RUNTIME_syslog ?= "sysklogd"
125RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\
126 ${VIRTUAL-RUNTIME_initscripts} \
127 ${VIRTUAL-RUNTIME_init_manager} \
128 ethtool \
129 ${VIRTUAL-RUNTIME_login_manager} \
130 ${VIRTUAL-RUNTIME_syslog} \
131 "
132
133RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\
134 cracklib \
135 gzip \
136 ${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
137 shadow \
138 sudo \
139 "
140
141RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\
142 at \
143 bzip2 \
144 cronie \
145 dbus \
146 dbus-glib \
147 python-dbus \
148 elfutils \
149 gzip \
150 less \
151 libcap \
152 libevent \
153 lighttpd \
154 logrotate \
155 nfs-utils \
156 pciutils \
157 libpcre \
158 rpcbind \
159 sysfsutils \
160 tcp-wrappers \
161 tzdata \
162 "
163
diff --git a/meta/recipes-graphics/images/core-image-directfb.bb b/meta/recipes-graphics/images/core-image-directfb.bb
index ad0197ccec..5641195e8c 100644
--- a/meta/recipes-graphics/images/core-image-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-directfb.bb
@@ -12,6 +12,6 @@ CONFLICT_DISTRO_FEATURES = "x11"
12 12
13IMAGE_INSTALL += "\ 13IMAGE_INSTALL += "\
14 ${CORE_IMAGE_BASE_INSTALL} \ 14 ${CORE_IMAGE_BASE_INSTALL} \
15 packagegroup-core-basic \ 15 packagegroup-core-full-cmdline \
16 packagegroup-core-directfb \ 16 packagegroup-core-directfb \
17" 17"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-08 06:32:58 +0000