mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

core-image-basic / packagegroup-core-basic: rename to *-full-cmdline

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2014-03-06 16:46:08 +00:00
committed by Richard Purdie
parent 2f9bf7bc97
commit 91c372f287
6 changed files with 167 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/lib/oeqa/selftest/bbtests.py
View File

@@ -68,7 +68,7 @@ class BitbakeTests(oeSelfTest):
self.assertTrue(find_task)
def test_bitbake_g(self):
result = bitbake('-g core-image-basic')
result = bitbake('-g core-image-full-cmdline')
self.assertTrue('NOTE: PN build list saved to \'pn-buildlist\'' in result.output)
self.assertTrue('openssh' in ftools.read_file(os.path.join(self.builddir, 'pn-buildlist')))
for f in ['pn-buildlist', 'pn-depends.dot', 'package-depends.dot', 'task-depends.dot']:

2
meta/recipes-extended/images/core-image-basic.bb → meta/recipes-extended/images/core-image-full-cmdline.bb
View File

@@ -5,7 +5,7 @@ IMAGE_FEATURES += "splash ssh-server-openssh"
IMAGE_INSTALL = "\
packagegroup-core-boot \
packagegroup-core-basic \
packagegroup-core-full-cmdline \
${CORE_IMAGE_EXTRA_INSTALL} \
"

2
meta/recipes-extended/images/core-image-lsb.bb
View File

@@ -5,7 +5,7 @@ IMAGE_FEATURES += "splash ssh-server-openssh hwcodecs package-management"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
packagegroup-core-basic \
packagegroup-core-full-cmdline \
packagegroup-core-lsb \
"

138
meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
View File

@@ -1,138 +0,0 @@
#
# Copyright (C) 2010 Intel Corporation
#
SUMMARY = "Create Basic Image Tasks"
PR = "r6"
LICENSE = "MIT"
inherit packagegroup
PACKAGES = "\
packagegroup-core-basic \
packagegroup-core-basic-libs \
packagegroup-core-basic-utils \
packagegroup-core-basic-extended \
packagegroup-core-dev-utils \
packagegroup-core-multiuser \
packagegroup-core-initscripts \
packagegroup-core-sys-services \
"
python __anonymous () {
# For backwards compatibility after rename
packages = d.getVar("PACKAGES", True).split()
for pkg in packages:
d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
}
RDEPENDS_packagegroup-core-basic = "\
packagegroup-core-basic-libs \
packagegroup-core-basic-utils \
packagegroup-core-basic-extended \
packagegroup-core-dev-utils \
packagegroup-core-multiuser \
packagegroup-core-initscripts \
packagegroup-core-sys-services \
"
RDEPENDS_packagegroup-core-basic-libs = "\
glib-2.0 \
"
RDEPENDS_packagegroup-core-basic-utils = "\
bash \
acl \
attr \
bc \
coreutils \
cpio \
e2fsprogs \
ed \
file \
findutils \
gawk \
gmp \
grep \
makedevs \
mc \
mc-fish \
mc-helpers \
mc-helpers-perl \
mc-helpers-python \
mktemp \
ncurses \
net-tools \
pax \
popt \
procps \
psmisc \
sed \
tar \
time \
util-linux \
zlib \
"
RDEPENDS_packagegroup-core-basic-extended = "\
iproute2 \
iputils \
iptables \
module-init-tools \
openssl \
"
RDEPENDS_packagegroup-core-dev-utils = "\
byacc \
diffutils \
m4 \
make \
patch \
"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_login_manager ?= "busybox"
VIRTUAL-RUNTIME_syslog ?= "sysklogd"
RDEPENDS_packagegroup-core-initscripts = "\
${VIRTUAL-RUNTIME_initscripts} \
${VIRTUAL-RUNTIME_init_manager} \
ethtool \
${VIRTUAL-RUNTIME_login_manager} \
${VIRTUAL-RUNTIME_syslog} \
"
RDEPENDS_packagegroup-core-multiuser = "\
cracklib \
gzip \
${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
shadow \
sudo \
"
RDEPENDS_packagegroup-core-sys-services = "\
at \
bzip2 \
cronie \
dbus \
dbus-glib \
python-dbus \
elfutils \
gzip \
less \
libcap \
libevent \
lighttpd \
logrotate \
nfs-utils \
pciutils \
libpcre \
rpcbind \
sysfsutils \
tcp-wrappers \
tzdata \
"

163
meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb Normal file
View File

@@ -0,0 +1,163 @@
#
# Copyright (C) 2010 Intel Corporation
#
SUMMARY = "Standard full-featured Linux system"
DESCRIPTION = "Package group bringing in packages needed for a more traditional full-featured Linux system"
PR = "r6"
LICENSE = "MIT"
inherit packagegroup
PACKAGES = "\
packagegroup-core-full-cmdline \
packagegroup-core-full-cmdline-libs \
packagegroup-core-full-cmdline-utils \
packagegroup-core-full-cmdline-extended \
packagegroup-core-full-cmdline-dev-utils \
packagegroup-core-full-cmdline-multiuser \
packagegroup-core-full-cmdline-initscripts \
packagegroup-core-full-cmdline-sys-services \
"
python __anonymous () {
# For backwards compatibility after rename
namemap = {}
namemap["packagegroup-core-full-cmdline"] = "packagegroup-core-basic"
namemap["packagegroup-core-full-cmdline-libs"] = "packagegroup-core-basic-libs"
namemap["packagegroup-core-full-cmdline-utils"] = "packagegroup-core-basic-utils"
namemap["packagegroup-core-full-cmdline-extended"] = "packagegroup-core-basic-extended"
namemap["packagegroup-core-full-cmdline-dev-utils"] = "packagegroup-core-dev-utils"
namemap["packagegroup-core-full-cmdline-multiuser"] = "packagegroup-core-multiuser"
namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts"
namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services"
packages = d.getVar("PACKAGES", True).split()
for pkg in packages:
if pkg.endswith('-dev'):
mapped = namemap.get(pkg[:-4], None)
if mapped:
mapped += '-dev'
elif pkg.endswith('-dbg'):
mapped = namemap.get(pkg[:-4], None)
if mapped:
mapped += '-dbg'
else:
mapped = namemap.get(pkg, None)
if mapped:
oldtaskname = mapped.replace("packagegroup-core", "task-core")
mapstr = " %s %s" % (mapped, oldtaskname)
d.appendVar("RPROVIDES_%s" % pkg, mapstr)
d.appendVar("RREPLACES_%s" % pkg, mapstr)
d.appendVar("RCONFLICTS_%s" % pkg, mapstr)
}
RDEPENDS_packagegroup-core-full-cmdline = "\
packagegroup-core-full-cmdline-libs \
packagegroup-core-full-cmdline-utils \
packagegroup-core-full-cmdline-extended \
packagegroup-core-full-cmdline-dev-utils \
packagegroup-core-full-cmdline-multiuser \
packagegroup-core-full-cmdline-initscripts \
packagegroup-core-full-cmdline-sys-services \
"
RDEPENDS_packagegroup-core-full-cmdline-libs = "\
glib-2.0 \
"
RDEPENDS_packagegroup-core-full-cmdline-utils = "\
bash \
acl \
attr \
bc \
coreutils \
cpio \
e2fsprogs \
ed \
file \
findutils \
gawk \
gmp \
grep \
makedevs \
mc \
mc-fish \
mc-helpers \
mc-helpers-perl \
mc-helpers-python \
mktemp \
ncurses \
net-tools \
pax \
popt \
procps \
psmisc \
sed \
tar \
time \
util-linux \
zlib \
"
RDEPENDS_packagegroup-core-full-cmdline-extended = "\
iproute2 \
iputils \
iptables \
module-init-tools \
openssl \
"
RDEPENDS_packagegroup-core-full-cmdline-dev-utils = "\
byacc \
diffutils \
m4 \
make \
patch \
"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_login_manager ?= "busybox"
VIRTUAL-RUNTIME_syslog ?= "sysklogd"
RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\
${VIRTUAL-RUNTIME_initscripts} \
${VIRTUAL-RUNTIME_init_manager} \
ethtool \
${VIRTUAL-RUNTIME_login_manager} \
${VIRTUAL-RUNTIME_syslog} \
"
RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\
cracklib \
gzip \
${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
shadow \
sudo \
"
RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\
at \
bzip2 \
cronie \
dbus \
dbus-glib \
python-dbus \
elfutils \
gzip \
less \
libcap \
libevent \
lighttpd \
logrotate \
nfs-utils \
pciutils \
libpcre \
rpcbind \
sysfsutils \
tcp-wrappers \
tzdata \
"

2
meta/recipes-graphics/images/core-image-directfb.bb
View File

@@ -12,6 +12,6 @@ CONFLICT_DISTRO_FEATURES = "x11"
IMAGE_INSTALL += "\
${CORE_IMAGE_BASE_INSTALL} \
packagegroup-core-basic \
packagegroup-core-full-cmdline \
packagegroup-core-directfb \
"