From: Saul Wold <sgw@linux.intel.com>
To: Paul Eggleton <paul.eggleton@linux.intel.com>,
openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 01/38] *-basic: rename to *-standardlinux - AB Change NEEDED
Date: Sun, 29 Dec 2013 15:46:31 -0800 [thread overview]
Message-ID: <52C0B457.3070002@linux.intel.com> (raw)
In-Reply-To: <adab38ead3101f3c88240606dc40ee629cac6f79.1388269205.git.paul.eggleton@linux.intel.com>
This will need a heads up to Beth to fix the autobuilder since we build
the -basic target for the -lsb builds, it will need to change also.
Sau!
On 12/28/2013 02:28 PM, Paul Eggleton wrote:
> This more accurately represents what this image and packagegroup are
> intended to provide, and avoids confusion with the similarly named
> core-image-base and packagegroup-base.
>
> Part of the fix for [YOCTO #2424].
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> meta/recipes-extended/images/core-image-lsb.bb | 2 +-
> ...-image-basic.bb => core-image-standardlinux.bb} | 2 +-
> .../packagegroups/packagegroup-core-basic.bb | 138 -----------------
> .../packagegroup-core-standardlinux.bb | 163 +++++++++++++++++++++
> .../recipes-graphics/images/core-image-directfb.bb | 2 +-
> 5 files changed, 166 insertions(+), 141 deletions(-)
> rename meta/recipes-extended/images/{core-image-basic.bb => core-image-standardlinux.bb} (87%)
> delete mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
> create mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-standardlinux.bb
>
> diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
> index f22d199..713a48e 100644
> --- a/meta/recipes-extended/images/core-image-lsb.bb
> +++ b/meta/recipes-extended/images/core-image-lsb.bb
> @@ -6,7 +6,7 @@ IMAGE_FEATURES += "splash ssh-server-openssh hwcodecs package-management"
>
> IMAGE_INSTALL = "\
> ${CORE_IMAGE_BASE_INSTALL} \
> - packagegroup-core-basic \
> + packagegroup-core-standardlinux \
> packagegroup-core-lsb \
> "
>
> diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-standardlinux.bb
> similarity index 87%
> rename from meta/recipes-extended/images/core-image-basic.bb
> rename to meta/recipes-extended/images/core-image-standardlinux.bb
> index d599e72..19985a9 100644
> --- a/meta/recipes-extended/images/core-image-basic.bb
> +++ b/meta/recipes-extended/images/core-image-standardlinux.bb
> @@ -5,7 +5,7 @@ IMAGE_FEATURES += "splash ssh-server-openssh"
>
> IMAGE_INSTALL = "\
> packagegroup-core-boot \
> - packagegroup-core-basic \
> + packagegroup-core-standardlinux \
> ${CORE_IMAGE_EXTRA_INSTALL} \
> "
>
> 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 c89923d..0000000
> --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
> +++ /dev/null
> @@ -1,138 +0,0 @@
> -#
> -# Copyright (C) 2010 Intel Corporation
> -#
> -
> -DESCRIPTION = "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 \
> - "
> -
> diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-standardlinux.bb b/meta/recipes-extended/packagegroups/packagegroup-core-standardlinux.bb
> new file mode 100644
> index 0000000..3b04067
> --- /dev/null
> +++ b/meta/recipes-extended/packagegroups/packagegroup-core-standardlinux.bb
> @@ -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-standardlinux \
> + packagegroup-core-standardlinux-libs \
> + packagegroup-core-standardlinux-utils \
> + packagegroup-core-standardlinux-extended \
> + packagegroup-core-standardlinux-dev-utils \
> + packagegroup-core-standardlinux-multiuser \
> + packagegroup-core-standardlinux-initscripts \
> + packagegroup-core-standardlinux-sys-services \
> + "
> +
> +python __anonymous () {
> + # For backwards compatibility after rename
> + namemap = {}
> + namemap["packagegroup-core-standardlinux"] = "packagegroup-core-basic"
> + namemap["packagegroup-core-standardlinux-libs"] = "packagegroup-core-basic-libs"
> + namemap["packagegroup-core-standardlinux-utils"] = "packagegroup-core-basic-utils"
> + namemap["packagegroup-core-standardlinux-extended"] = "packagegroup-core-basic-extended"
> + namemap["packagegroup-core-standardlinux-dev-utils"] = "packagegroup-core-dev-utils"
> + namemap["packagegroup-core-standardlinux-multiuser"] = "packagegroup-core-multiuser"
> + namemap["packagegroup-core-standardlinux-initscripts"] = "packagegroup-core-initscripts"
> + namemap["packagegroup-core-standardlinux-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-standardlinux = "\
> + packagegroup-core-standardlinux-libs \
> + packagegroup-core-standardlinux-utils \
> + packagegroup-core-standardlinux-extended \
> + packagegroup-core-standardlinux-dev-utils \
> + packagegroup-core-standardlinux-multiuser \
> + packagegroup-core-standardlinux-initscripts \
> + packagegroup-core-standardlinux-sys-services \
> + "
> +
> +RDEPENDS_packagegroup-core-standardlinux-libs = "\
> + glib-2.0 \
> + "
> +
> +RDEPENDS_packagegroup-core-standardlinux-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-standardlinux-extended = "\
> + iproute2 \
> + iputils \
> + iptables \
> + module-init-tools \
> + openssl \
> + "
> +
> +RDEPENDS_packagegroup-core-standardlinux-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-standardlinux-initscripts = "\
> + ${VIRTUAL-RUNTIME_initscripts} \
> + ${VIRTUAL-RUNTIME_init_manager} \
> + ethtool \
> + ${VIRTUAL-RUNTIME_login_manager} \
> + ${VIRTUAL-RUNTIME_syslog} \
> + "
> +
> +RDEPENDS_packagegroup-core-standardlinux-multiuser = "\
> + cracklib \
> + gzip \
> + ${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
> + shadow \
> + sudo \
> + "
> +
> +RDEPENDS_packagegroup-core-standardlinux-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 \
> + "
> +
> diff --git a/meta/recipes-graphics/images/core-image-directfb.bb b/meta/recipes-graphics/images/core-image-directfb.bb
> index 0c6c882..20588f0 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"
>
> IMAGE_INSTALL += "\
> ${CORE_IMAGE_BASE_INSTALL} \
> - packagegroup-core-basic \
> + packagegroup-core-standardlinux \
> packagegroup-core-directfb \
> "
>
next prev parent reply other threads:[~2013-12-29 23:46 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-28 22:28 [PATCH 00/38] Cleanup series Paul Eggleton
2013-12-28 22:28 ` [PATCH 01/38] *-basic: rename to *-standardlinux Paul Eggleton
2013-12-29 23:46 ` Saul Wold [this message]
2014-01-02 17:04 ` [PATCH 01/38] *-basic: rename to *-standardlinux - AB Change NEEDED Flanagan, Elizabeth
2013-12-30 1:35 ` [PATCH 01/38] *-basic: rename to *-standardlinux Robert Yang
2013-12-30 12:59 ` Paul Eggleton
2014-02-24 16:38 ` Paul Eggleton
2014-02-24 17:00 ` Richard Purdie
2014-02-24 17:17 ` Mark Hatle
2014-02-24 23:01 ` Richard Purdie
2014-02-24 23:31 ` Paul Barker
2014-02-25 5:53 ` Khem Raj
2014-02-25 6:15 ` Saul Wold
2014-02-25 7:14 ` Robert Yang
2014-02-25 12:13 ` Koen Kooi
2014-02-25 14:23 ` Paul Eggleton
2013-12-28 22:28 ` [PATCH 02/38] Drop empty/invalid BUGTRACKER values Paul Eggleton
2013-12-28 22:28 ` [PATCH 03/38] Replace OpenedHand Bugzilla in BUGTRACKER Paul Eggleton
2013-12-28 22:29 ` [PATCH 04/38] Replace one-line DESCRIPTION with SUMMARY Paul Eggleton
2013-12-28 22:29 ` [PATCH 05/38] Replace one-line DESCRIPTION with SUMMARY and tweak Paul Eggleton
2013-12-28 22:29 ` [PATCH 06/38] Add missing SUMMARY values Paul Eggleton
2013-12-28 22:29 ` [PATCH 07/38] alsa-utils: add missing individual package " Paul Eggleton
2013-12-28 22:29 ` [PATCH 08/38] qmmp: add SUMMARY and tweak DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 09/38] gettext: set reasonable SUMMARY and DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 10/38] telepathy-mission-control: fix HOMEPAGE Paul Eggleton
2013-12-28 22:29 ` [PATCH 11/38] libsamplerate0: add HOMEPAGE Paul Eggleton
2013-12-28 22:29 ` [PATCH 12/38] lame: update HOMEPAGE Paul Eggleton
2013-12-28 22:29 ` [PATCH 13/38] startup-notification: fix HOMEPAGE Paul Eggleton
2013-12-28 22:29 ` [PATCH 14/38] bash: update HOMEPAGE Paul Eggleton
2013-12-28 22:29 ` [PATCH 15/38] libunique: fix HOMEPAGE and touch up DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 16/38] xev: add proper SUMMARY and DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 17/38] gawk: set reasonable " Paul Eggleton
2013-12-28 22:29 ` [PATCH 18/38] linux-dummy: set LICENSE to GPLv2 to avoid license warning Paul Eggleton
2013-12-28 22:29 ` [PATCH 19/38] linux-dummy: set reasonable DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 20/38] Basic recipe formatting fixes Paul Eggleton
2013-12-28 22:29 ` [PATCH 21/38] qt4: set SUMMARY and tweak DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 22/38] xf86-input-vmmouse: set SUMMARY and DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 23/38] xf86-video-fbdev: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 24/38] xf86-video-modesetting: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 25/38] gmp: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 26/38] icecc-create-env-native: add SUMMARY and tweak DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 27/38] binutils: add/tweak SUMMARY Paul Eggleton
2013-12-28 22:29 ` [PATCH 28/38] core-image-lsb: fix DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 29/38] adt-installer: tweak DESCRIPTION and add SUMMARY and HOMEPAGE Paul Eggleton
2013-12-28 22:29 ` [PATCH 30/38] stat: tidy up recipe Paul Eggleton
2013-12-28 22:29 ` [PATCH 31/38] enchant: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 32/38] guilt-native: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 33/38] opkg-utils: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 34/38] pciutils: " Paul Eggleton
2013-12-28 22:29 ` [PATCH 35/38] speex: fix SRC_URI to use PV instead of hardcoding the version Paul Eggleton
2013-12-28 22:29 ` [PATCH 36/38] bitbake.conf: add full stop to default DESCRIPTION Paul Eggleton
2013-12-28 22:29 ` [PATCH 37/38] classes/package: set SUMMARY in do_split_packages() Paul Eggleton
2013-12-28 22:29 ` [PATCH 38/38] bitbake.conf: set a default for MACHINE_FEATURES Paul Eggleton
2013-12-29 22:55 ` [PATCH 00/38] Cleanup series Trevor Woerner
2013-12-29 23:07 ` Paul Eggleton
2014-01-02 20:56 ` Paul Eggleton
2014-01-02 22:36 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52C0B457.3070002@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=paul.eggleton@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.