* [PATCH 1/5] eglibc: check dependencies among eglibc options
2011-08-18 9:18 [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Kang Kai
@ 2011-08-18 9:18 ` Kang Kai
2011-08-18 9:18 ` [PATCH 2/5] mailx: update license and distro tracking fileds Kang Kai
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Kang Kai @ 2011-08-18 9:18 UTC (permalink / raw)
To: sgw; +Cc: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Fixes [Yocto #1212]
'libc-inet' and 'ipv4' are the same thing, so remove 'libc-inet'
from the default DISTRO_FEATURES_LIBC in file default-distrovars.inc.
Check the dependencies among eglibc configurable options, make sure
that eglibc could be compile successfully only with part of the options.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/conf/distro/include/default-distrovars.inc | 2 +-
meta/recipes-core/eglibc/eglibc-options.inc | 75 ++++++++++++++++++++++-
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 45b03d5..79c6e14 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -12,7 +12,7 @@ LOCALE_UTF8_ONLY ?= "0"
DISTRO_FEATURES_LIBC ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
- libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
+ libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
libc-posix-wchar-io"
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
index 119ceef..112029d 100644
--- a/meta/recipes-core/eglibc/eglibc-options.inc
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -10,10 +10,83 @@ def eglibc_cfg(feature, features, tokens, cnf):
cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])
+# arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code
+def distro_features_check_deps(distro_features):
+ new_dep = True
+ while new_dep:
+ new_dep = False
+
+ if 'ipv6' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'ipv4' in distro_features and 'libc-nsswitch' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-nsswitch'])
+
+ if 'libc-cxx-tests' in distro_features:
+ if 'libc-posix-wchar-io' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-wchar-io'])
+ if 'libc-libm' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-libm'])
+
+ if 'libc-catgets' in distro_features and 'libc-locale-code' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-locale-code'])
+
+ if 'libc-crypt-ufc' in distro_features and 'libc-crypt' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-crypt'])
+
+ if 'libc-getlogin' in distro_features and 'libc-utmp' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-utmp'])
+
+ if 'libc-inet-anl' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'libc-locale-code' in distro_features and 'libc-posix-clang-wchar' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-clang-wchar'])
+
+ if 'libc-nis' in distro_features:
+ if 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+ if 'libc-sunrpc' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-sunrpc'])
+
+ if 'libc-rcmd' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'libc-sunrpc' in distro_features and 'ipv4' not in distro_features:
+ new_dep = True
+ distro_features.extend(['ipv4'])
+
+ if 'libc-utmpx' in distro_features and 'libc-utmp' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-utmp'])
+
+ if 'libc-posix-regexp-glibc' in distro_features and 'libc-posix-regexp' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-regexp'])
+
+ if 'libc-posix-wchar-io' in distro_features and 'libc-posix-clang-wchar' not in distro_features:
+ new_dep = True
+ distro_features.extend(['libc-posix-clang-wchar'])
+
# Map distro features to eglibc options settings
def features_to_eglibc_settings(d):
cnf = ([])
distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split()
+
+ distro_features_check_deps(distro_features)
+
eglibc_cfg('ipv6', distro_features, 'OPTION_EGLIBC_ADVANCED_INET6', cnf)
eglibc_cfg('libc-backtrace', distro_features, 'OPTION_EGLIBC_BACKTRACE', cnf)
eglibc_cfg('libc-big-macros', distro_features, 'OPTION_EGLIBC_BIG_MACROS', cnf)
@@ -31,7 +104,7 @@ def features_to_eglibc_settings(d):
eglibc_cfg('libc-ftraverse', distro_features, 'OPTION_EGLIBC_FTRAVERSE', cnf)
eglibc_cfg('libc-getlogin', distro_features, 'OPTION_EGLIBC_GETLOGIN', cnf)
eglibc_cfg('libc-idn', distro_features, 'OPTION_EGLIBC_IDN', cnf)
- eglibc_cfg('libc-inet', distro_features, 'OPTION_EGLIBC_INET', cnf)
+ eglibc_cfg('ipv4', distro_features, 'OPTION_EGLIBC_INET', cnf)
eglibc_cfg('libc-inet-anl', distro_features, 'OPTION_EGLIBC_INET_ANL', cnf)
eglibc_cfg('libc-libm', distro_features, 'OPTION_EGLIBC_LIBM', cnf)
eglibc_cfg('libc-libm-big', distro_features, 'OPTION_EGLIBC_LIBM_BIG', cnf)
--
1.7.5.1.300.gc565c
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] mailx: update license and distro tracking fileds
2011-08-18 9:18 [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Kang Kai
2011-08-18 9:18 ` [PATCH 1/5] eglibc: check dependencies among eglibc options Kang Kai
@ 2011-08-18 9:18 ` Kang Kai
2011-08-18 9:18 ` [PATCH 3/5] slang: add homepage and update distro tracking fields Kang Kai
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Kang Kai @ 2011-08-18 9:18 UTC (permalink / raw)
To: sgw; +Cc: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
update mailx license and bump up PR, and update distro tracking fields.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 9 +++++++--
meta/recipes-extended/mailx/mailx_12.5.bb | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index c7e5db5..ad4cabe 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5699,8 +5699,13 @@ RECIPE_MAINTAINER_pn-docbook-utils = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_LATEST_VERSION_pn-task-qte-toolchain-target = "1.0"
RECIPE_MANUAL_CHECK_DATE_pn-task-qte-toolchain-target = "Feb 28, 2011"
DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel"
-RECIPE_LATEST_VERSION_pn-mailx = "12.4"
-RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Feb 28, 2011"
+
+RECIPE_STATUS_pn-mailx = "green"
+RECIPE_LATEST_VERSION_pn-mailx = "12.5"
+RECIPE_LAST_UPDATE_pn-mailx = "Jul 1, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Jul 28, 2011"
+RECIPE_MAINTAINER_pn-mailx = "Kai Kang <kai.kang@windriver.com>"
+
RECIPE_LATEST_VERSION_pn-libgcc = "4.5.1"
RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Feb 28, 2011"
diff --git a/meta/recipes-extended/mailx/mailx_12.5.bb b/meta/recipes-extended/mailx/mailx_12.5.bb
index 1173b0a..52b906f 100644
--- a/meta/recipes-extended/mailx/mailx_12.5.bb
+++ b/meta/recipes-extended/mailx/mailx_12.5.bb
@@ -6,8 +6,8 @@ for MIME, IMAP, POP3, SMTP, and S/MIME."
HOMEPAGE = "http://heirloom.sourceforge.net/mailx.html"
SECTION = "console/network"
-PR = "r0"
-LICENSE = "GPL"
+PR = "r1"
+LICENSE = "BSD & MPL-1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd"
SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \
--
1.7.5.1.300.gc565c
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] slang: add homepage and update distro tracking fields
2011-08-18 9:18 [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Kang Kai
2011-08-18 9:18 ` [PATCH 1/5] eglibc: check dependencies among eglibc options Kang Kai
2011-08-18 9:18 ` [PATCH 2/5] mailx: update license and distro tracking fileds Kang Kai
@ 2011-08-18 9:18 ` Kang Kai
2011-08-18 9:18 ` [PATCH 4/5] alsa-tools: update license and add " Kang Kai
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Kang Kai @ 2011-08-18 9:18 UTC (permalink / raw)
To: sgw; +Cc: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Add slang homepage and bump up PR.
Update distro tracking fields.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 5 +++--
meta/recipes-extended/slang/slang_2.2.4.bb | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index ad4cabe..1190359 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5731,8 +5731,9 @@ RECIPE_MAINTAINER_pn-linuxdoc-tools = "Scott Garman <scott.a.garman@intel.com>"
RECIPE_STATUS_pn-slang = "green"
RECIPE_LATEST_VERSION_pn-slang = "2.2.4"
-RECIPE_LAST_UPDATE_pn-slang = "Apr 10, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 6, 2011"
+RECIPE_LAST_UPDATE_pn-slang = "Jul 28, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011"
+RECIPE_MAINTAINER_pn-slang = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-libnewt = "green"
RECIPE_LATEST_VERSION_pn-libnewt = "0.52.12"
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 4bf5737..77e63da 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -7,9 +7,10 @@ The S-Lang library, provided in this package, provides the S-Lang \
extension language. S-Lang's syntax resembles C, which makes it easy \
to recode S-Lang procedures in C if you need to."
+HOMEPAGE = "http://www.jedsoft.org/slang/"
SECTION = "libs"
DEPENDS = "pcre"
-PR = "r5"
+PR = "r6"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
--
1.7.5.1.300.gc565c
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] alsa-tools: update license and add distro tracking fields
2011-08-18 9:18 [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Kang Kai
` (2 preceding siblings ...)
2011-08-18 9:18 ` [PATCH 3/5] slang: add homepage and update distro tracking fields Kang Kai
@ 2011-08-18 9:18 ` Kang Kai
2011-08-18 9:18 ` [PATCH 5/5] newt: update " Kang Kai
2011-08-23 6:30 ` [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Kang Kai @ 2011-08-18 9:18 UTC (permalink / raw)
To: sgw; +Cc: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Update license and other informations, then bump up PR.
Update distro tracking fields.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 7 ++++---
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 11 +++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 1190359..9dcd3ab 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5770,10 +5770,11 @@ RECIPE_COMMENTS_pn-rxvt-unicode = ""
RECIPE_LAST_UPDATE_pn-rxvt-unicode = "May 25, 2011"
RECIPE_MAINTAINER_pn-rxvt-unicode = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_STATUS_pn-alsa-tools = "red"
+RECIPE_STATUS_pn-alsa-tools = "green"
RECIPE_LATEST_VERIONS_pn-alsa-tools = "1.0.24.1
-RECIPE_LAST_UPDATE_pn-alsa-tools = "Jan 31, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-alsa-tools = "Jun 7, 2011"
+RECIPE_LAST_UPDATE_pn-alsa-tools = "Jul 28, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-alsa-tools = "Jul 28, 2011"
+RECIPE_MAINTAINER_pn-alsa-tools = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-mesa-demos = "red"
RECIPE_LATEST_VERSION_pn-mesa-demos = "8.0.1"
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
index 1bf9cd0..ed2886d 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
@@ -1,13 +1,16 @@
BROKEN = "1"
-DESCRIPTION = "Alsa Tools"
+DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards."
+HOMEPAGE = "http://www.alsa-project.org"
+BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
SECTION = "console/utils"
-LICENSE = "GPLv2"
+LICENSE = "GPLv2 & LGPLv2+"
DEPENDS = "alsa-lib ncurses"
-PR = "r2"
+PR = "r3"
-LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+ file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
file://autotools.patch"
--
1.7.5.1.300.gc565c
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] newt: update distro tracking fields
2011-08-18 9:18 [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Kang Kai
` (3 preceding siblings ...)
2011-08-18 9:18 ` [PATCH 4/5] alsa-tools: update license and add " Kang Kai
@ 2011-08-18 9:18 ` Kang Kai
2011-08-23 6:30 ` [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Kang Kai @ 2011-08-18 9:18 UTC (permalink / raw)
To: sgw; +Cc: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Update newt distro tracking fields
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 9dcd3ab..da425e6 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5736,10 +5736,10 @@ RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011"
RECIPE_MAINTAINER_pn-slang = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-libnewt = "green"
-RECIPE_LATEST_VERSION_pn-libnewt = "0.52.12"
-RECIPE_LAST_UPDATE_pn-libnewt = "Aug 06, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jun 4, 2011"
-RECIPE_NO_UPDATE_REASON_pn-libnewt = ""
+RECIPE_LATEST_VERSION_pn-libnewt = "0.52.13"
+RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <kai.kang@windriver.com>"
+RECIPE_LAST_UPDATE_pn-libnewt = "Jul 27, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jul 27, 2011"
RECIPE_STATUS_pn-createrepo = "green"
RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
--
1.7.5.1.300.gc565c
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit
2011-08-18 9:18 [PATCH 0/5] bug fix for 1212 and split the previous distro tracking fields commit Kang Kai
` (4 preceding siblings ...)
2011-08-18 9:18 ` [PATCH 5/5] newt: update " Kang Kai
@ 2011-08-23 6:30 ` Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-08-23 6:30 UTC (permalink / raw)
To: Kang Kai; +Cc: openembedded-core
On 08/18/2011 02:18 AM, Kang Kai wrote:
> From: Kang Kai<kai.kang@windriver.com>
>
> Hi Saul,
>
> I add a method to check the depencies between eglibc configurable options. When one option
> is set in DISTRO_FEATURES_LIBC then the required options will be set too.
> Fixes [Yocto #1212]
>
> Split the previous update distro tracking fields commit.
>
> Regards,
>
> The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd:
>
> Fixup remaining bb.msg.domain users (2011-08-15 17:31:52 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib kangkai/distro
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro
>
> Kang Kai (5):
> eglibc: check dependencies among eglibc options
> mailx: update license and distro tracking fileds
> slang: add homepage and update distro tracking fields
> alsa-tools: update license and add distro tracking fields
> newt: update distro tracking fields
>
> meta/conf/distro/include/default-distrovars.inc | 2 +-
> .../conf/distro/include/distro_tracking_fields.inc | 29 +++++---
> meta/recipes-core/eglibc/eglibc-options.inc | 75 +++++++++++++++++++-
> meta/recipes-extended/mailx/mailx_12.5.bb | 4 +-
> meta/recipes-extended/slang/slang_2.2.4.bb | 3 +-
> .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 11 ++-
> 6 files changed, 104 insertions(+), 20 deletions(-)
>
Merged in OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 7+ messages in thread