* [Consolidated & Tested 01/35] meta/conf/local.conf.sample: remove oprofileui-native related settings
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout Saul Wold
` (34 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
oprofileui-nativesdk would be a better way to handle these kinds of
requirements with the modern system, and it is not something that most
users will need to configure anyway (nor was it supported.)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/conf/local.conf.sample | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 812b896..7a5e533 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -119,12 +119,6 @@ PACKAGE_DEBUG_SPLIT_STYLE = '.debug'
# Uncomment this if you want BitBake to emit the log if a build fails.
BBINCLUDELOGS = "yes"
-# Set this if you wish to make pkgconfig libraries from your system available
-# for native builds. Combined with extra ASSUME_PROVIDEDs this can allow
-# native builds of applications like oprofileui-native (unsupported feature).
-#EXTRA_NATIVE_PKGCONFIG_PATH = ":/usr/lib/pkgconfig"
-#ASSUME_PROVIDED += "gtk+-native libglade-native"
-
ENABLE_BINARY_LOCALE_GENERATION = "1"
# The architecture to build SDK items for, by setting this you can build SDK
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 01/35] meta/conf/local.conf.sample: remove oprofileui-native related settings Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 9:36 ` Phil Blundell
2011-07-27 7:46 ` [Consolidated & Tested 03/35] meta/conf/local.conf.sample: improve terminal examples/comments Saul Wold
` (33 subsequent siblings)
35 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Some additions and grammar fixes to the comments, as well as moving
the locale options to the same place.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/conf/local.conf.sample | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 7a5e533..6bdd314 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -2,10 +2,10 @@
CONF_VERSION = "1"
# Uncomment and change to cache the files Poky downloads in an alternative
-# location, default it ${TOPDIR}/downloads
+# location, default is ${TOPDIR}/downloads
#DL_DIR ?= "${TOPDIR}/downloads"
# Uncomment and change to cache Poky's built staging output in an alternative
-# location, default ${TOPDIR}/sstate-cache
+# location, default is ${TOPDIR}/sstate-cache
#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
# Uncomment and set to allow bitbake to execute multiple tasks at once.
@@ -26,6 +26,8 @@ MACHINE ??= "qemux86"
#MACHINE ?= "qemux86"
#MACHINE ?= "qemux86-64"
+# BBMASK is a regular expression that can be used to tell BitBake to ignore
+# certain recipes.
BBMASK = ""
# EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images
@@ -41,9 +43,19 @@ BBMASK = ""
# "debug-tweaks" - make an image for suitable of development
# e.g. ssh root access has a blank password
# There are other application targets too, see meta/classes/core-image.bbclass
+<<<<<<< HEAD:meta/conf/local.conf.sample
# and meta/packages/tasks/task-core.bb for more details.
EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
+=======
+# and meta/recipes-core/tasks/task-core.bb for more details.
+<<<<<<< HEAD:meta-yocto/conf/local.conf.sample
+# The -sdk image includes these features by default now.
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+=======
+EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
+>>>>>>> d82e8ed... meta/conf/local.conf.sample: improve comments/layout:meta/conf/local.conf.sample
+>>>>>>> 8d50670... meta/conf/local.conf.sample: improve comments/layout:meta-yocto/conf/local.conf.sample
# A list of packaging systems used in generated images
# The first package type listed will be used for rootfs generation
@@ -119,8 +131,6 @@ PACKAGE_DEBUG_SPLIT_STYLE = '.debug'
# Uncomment this if you want BitBake to emit the log if a build fails.
BBINCLUDELOGS = "yes"
-ENABLE_BINARY_LOCALE_GENERATION = "1"
-
# The architecture to build SDK items for, by setting this you can build SDK
# packages for architectures other than the host i.e. building i686 packages
# on an x86_64 host.
@@ -150,6 +160,12 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
#case, which will take much time.
#TEST_SERIALIZE = "1"
+# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
+# packages at build time using qemu-native. Disabling it (by setting it to 0)
+# will save some build time at the expense of breaking i18n on devices with
+# less than 128MB RAM.
+ENABLE_BINARY_LOCALE_GENERATION = "1"
+
# Set GLIBC_GENERATE_LOCALES to the locales you wish to generate should you not
# wish to perform the time-consuming step of generating all LIBC locales.
# NOTE: If removing en_US.UTF-8 you will also need to uncomment, and set
@@ -160,10 +176,10 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
#IMAGE_LINGUAS ?= "en-gb"
#LIMIT_BUILT_LOCALES ?= "POSIX en_GB"
-# This value is currently used by PSEUDO to determine if the recipe should
+# This value is currently used by pseudo to determine if the recipe should
# build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system.
#
-# PSEUDO will attempt to determine if a 32-bit wrapper is necessary, but
+# Pseudo will attempt to determine if a 32-bit wrapper is necessary, but
# it doesn't always guess properly. If you have 32-bit executables on
# your 64-bit build system, you likely want to set this to "0",
# otherwise you could end up with incorrect file attributes on the
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout
2011-07-27 7:46 ` [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout Saul Wold
@ 2011-07-27 9:36 ` Phil Blundell
2011-07-27 15:52 ` Saul Wold
0 siblings, 1 reply; 51+ messages in thread
From: Phil Blundell @ 2011-07-27 9:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 00:46 -0700, Saul Wold wrote:
> # There are other application targets too, see meta/classes/core-image.bbclass
> +<<<<<<< HEAD:meta/conf/local.conf.sample
> # and meta/packages/tasks/task-core.bb for more details.
>
> EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
> +=======
> +# and meta/recipes-core/tasks/task-core.bb for more details.
> +<<<<<<< HEAD:meta-yocto/conf/local.conf.sample
> +# The -sdk image includes these features by default now.
> +EXTRA_IMAGE_FEATURES = "debug-tweaks"
> +=======
> +EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
> +>>>>>>> d82e8ed... meta/conf/local.conf.sample: improve comments/layout:meta/conf/local.conf.sample
> +>>>>>>> 8d50670... meta/conf/local.conf.sample: improve comments/layout:meta-yocto/conf/local.conf.sampl
Er? That doesn't look like it can be right. I'm a bit surprised that
you managed to test successfully with those conflict markers in there.
p.
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout
2011-07-27 9:36 ` Phil Blundell
@ 2011-07-27 15:52 ` Saul Wold
0 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 15:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Phil Blundell
On 07/27/2011 02:36 AM, Phil Blundell wrote:
> On Wed, 2011-07-27 at 00:46 -0700, Saul Wold wrote:
>> # There are other application targets too, see meta/classes/core-image.bbclass
>> +<<<<<<< HEAD:meta/conf/local.conf.sample
>> # and meta/packages/tasks/task-core.bb for more details.
>>
>> EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
>> +=======
>> +# and meta/recipes-core/tasks/task-core.bb for more details.
>> +<<<<<<< HEAD:meta-yocto/conf/local.conf.sample
>> +# The -sdk image includes these features by default now.
>> +EXTRA_IMAGE_FEATURES = "debug-tweaks"
>> +=======
>> +EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
>> +>>>>>>> d82e8ed... meta/conf/local.conf.sample: improve comments/layout:meta/conf/local.conf.sample
>> +>>>>>>> 8d50670... meta/conf/local.conf.sample: improve comments/layout:meta-yocto/conf/local.conf.sampl
>
> Er? That doesn't look like it can be right. I'm a bit surprised that
> you managed to test successfully with those conflict markers in there.
>
> p.
>
>
Your right, this was respun it did not trigger a conflict message
though.
Crazy.
Sau!
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 51+ messages in thread
* [Consolidated & Tested 03/35] meta/conf/local.conf.sample: improve terminal examples/comments
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 01/35] meta/conf/local.conf.sample: remove oprofileui-native related settings Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 04/35] meta/conf/local.conf.sample: remove nonfunctional BBINCLUDELOGS setting Saul Wold
` (32 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Default to XTERM_TERM* instead of KONSOLE_TERM* since Konsole support
only works for KDE 3.x, and note this in the comments (see Yocto bug 1294
for further details.) Also add a comment about PATCHRESOLVE = "noop".
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/conf/local.conf.sample | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 6bdd314..1f66c89 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -194,8 +194,12 @@ NO32LIBS = "1"
# when resolving patches which cannot be applied
# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN ARE:
# GNOME, SCREEN, XTERM and KONSOLE
-#TERMCMD = "${KONSOLE_TERMCMD}"
-#TERMCMDRUN = "${KONSOLE_TERMCMDRUN}"
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#TERMCMD = "${XTERM_TERMCMD}"
+#TERMCMDRUN = "${XTERM_TERMCMDRUN}"
+# Alternatively, if you prefer you can disable patch resolution:
+#PATCHRESOLVE = "noop"
# Uncomment this if your host distribution provides the help2man tool.
#ASSUME_PROVIDED += "help2man-native"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 04/35] meta/conf/local.conf.sample: remove nonfunctional BBINCLUDELOGS setting
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (2 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 03/35] meta/conf/local.conf.sample: improve terminal examples/comments Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 10:53 ` Paul Eggleton
2011-07-27 7:46 ` [Consolidated & Tested 05/35] libxcb: Add missing DEPENDS on libxdmcp Saul Wold
` (31 subsequent siblings)
35 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
This option does nothing in recent versions of BitBake, and the vast
majority of users will want the log printed out on failure anyway.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/conf/local.conf.sample | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 1f66c89..62e6e3b 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -128,9 +128,6 @@ PACKAGE_DEBUG_SPLIT_STYLE = '.debug'
# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}"
# LDFLAGS =+ "-pg"
-# Uncomment this if you want BitBake to emit the log if a build fails.
-BBINCLUDELOGS = "yes"
-
# The architecture to build SDK items for, by setting this you can build SDK
# packages for architectures other than the host i.e. building i686 packages
# on an x86_64 host.
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 04/35] meta/conf/local.conf.sample: remove nonfunctional BBINCLUDELOGS setting
2011-07-27 7:46 ` [Consolidated & Tested 04/35] meta/conf/local.conf.sample: remove nonfunctional BBINCLUDELOGS setting Saul Wold
@ 2011-07-27 10:53 ` Paul Eggleton
0 siblings, 0 replies; 51+ messages in thread
From: Paul Eggleton @ 2011-07-27 10:53 UTC (permalink / raw)
To: openembedded-core
On Wednesday 27 July 2011 08:46:54 Saul Wold wrote:
> From: Paul Eggleton <paul.eggleton@linux.intel.com>
>
> This option does nothing in recent versions of BitBake, and the vast
> majority of users will want the log printed out on failure anyway.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> meta/conf/local.conf.sample | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
> index 1f66c89..62e6e3b 100644
> --- a/meta/conf/local.conf.sample
> +++ b/meta/conf/local.conf.sample
> @@ -128,9 +128,6 @@ PACKAGE_DEBUG_SPLIT_STYLE = '.debug'
> # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}"
> # LDFLAGS =+ "-pg"
>
> -# Uncomment this if you want BitBake to emit the log if a build fails.
> -BBINCLUDELOGS = "yes"
> -
> # The architecture to build SDK items for, by setting this you can build
> SDK # packages for architectures other than the host i.e. building i686
> packages # on an x86_64 host.
I discussed this with Richard today - let's skip this patch since we should
really just fix the hardcoded setting in BitBake.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 51+ messages in thread
* [Consolidated & Tested 05/35] libxcb: Add missing DEPENDS on libxdmcp
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (3 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 04/35] meta/conf/local.conf.sample: remove nonfunctional BBINCLUDELOGS setting Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 06/35] dropbear: don't override DISTRO_TYPE if it is already set Saul Wold
` (30 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Observed this to fail when populating new tmpdir
from shared state
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-graphics/xcb/libxcb_1.7.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xcb/libxcb_1.7.bb b/meta/recipes-graphics/xcb/libxcb_1.7.bb
index 0f30c88..daecf0f 100644
--- a/meta/recipes-graphics/xcb/libxcb_1.7.bb
+++ b/meta/recipes-graphics/xcb/libxcb_1.7.bb
@@ -3,9 +3,9 @@ include libxcb.inc
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
-PR = "r1"
+PR = "r2"
-DEPENDS += "libpthread-stubs xcb-proto-native"
+DEPENDS += "libpthread-stubs xcb-proto-native libxdmcp"
PACKAGES =+ "libxcb-xinerama"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 06/35] dropbear: don't override DISTRO_TYPE if it is already set
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (4 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 05/35] libxcb: Add missing DEPENDS on libxdmcp Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 07/35] console-tools: removed wildcard from SRC_URI Saul Wold
` (29 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
The long term solution is to remove the IMAGE_FEATURE check since images are not allowed to influence recipe compile options.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-core/dropbear/dropbear.inc | 2 +-
meta/recipes-core/dropbear/dropbear_0.52.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1b51e1a..526a5a0 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -29,7 +29,7 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
BINCOMMANDS = "dbclient ssh scp"
EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
+DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
do_debug_patch() {
if [ "${DISTRO_TYPE}" = "debug" ]; then
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 78d6cf1..4013c65 100644
--- a/meta/recipes-core/dropbear/dropbear_0.52.bb
+++ b/meta/recipes-core/dropbear/dropbear_0.52.bb
@@ -3,4 +3,4 @@ require dropbear.inc
SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
-PR = "r2"
+PR = "r3"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 07/35] console-tools: removed wildcard from SRC_URI
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (5 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 06/35] dropbear: don't override DISTRO_TYPE if it is already set Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 08/35] module-init-tools: do not build static utilities for -cross Saul Wold
` (28 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wildcards in SRC_URI are not supported by oe-core and work only
when last (or first?) FILESPATH element points to the containing
directory. Specifying plain dir works fine for this recipe.
Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
---
.../console-tools/console-tools_0.3.2.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 5b09105..7baace6 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://compile.patch;patch=1 \
file://kbdrate.patch;patch=1 \
file://uclibc-fileno.patch;patch=1 \
- file://config/*.m4"
+ file://config"
SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd"
SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 08/35] module-init-tools: do not build static utilities for -cross
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (6 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 07/35] console-tools: removed wildcard from SRC_URI Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:46 ` [Consolidated & Tested 09/35] eglibc: remove unnecessary FILESPATHPKG usage Saul Wold
` (27 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
There is no need to have static module-init-tools for the cross
tools. Building such binaries requires a static libc which is not
required by the rest of OE and which is deprecated and not installed
by distributions like Fedora.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
.../module-init-tools-cross_3.16.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
index a59f96a..38f0476 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
@@ -8,4 +8,4 @@ SRC_URI += "file://no-static-binaries.patch"
SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
-EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
+EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX} --disable-static-utils"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 09/35] eglibc: remove unnecessary FILESPATHPKG usage
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (7 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 08/35] module-init-tools: do not build static utilities for -cross Saul Wold
@ 2011-07-27 7:46 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 10/35] scripts/combo-layer: keep carriage returns at the end of lines Saul Wold
` (26 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:46 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
This was not doing anything (we don't even have the eglibc-svn directory).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-core/eglibc/eglibc_2.13.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 6076ab9..e88e266 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,8 +3,7 @@ require eglibc.inc
SRCREV = "14157"
DEPENDS += "gperf-native"
-FILESPATHPKG =. "eglibc-svn:"
-PR = "r8"
+PR = "r9"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 10/35] scripts/combo-layer: keep carriage returns at the end of lines
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (8 preceding siblings ...)
2011-07-27 7:46 ` [Consolidated & Tested 09/35] eglibc: remove unnecessary FILESPATHPKG usage Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 11/35] machine/qemu: set preferred linux-yocto kernel version Saul Wold
` (25 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Use --keep-cr option to "git am" or otherwise we lose carriage returns
which can be important for patches against files that use CRs.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 84cc48f..d129175 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -254,7 +254,7 @@ def action_apply_patch(conf, args):
for line in open(repo['patchlist']):
patchfile = line.split()[0]
lastrev = line.split()[1]
- cmd = "git am -s -p1 %s" % patchfile
+ cmd = "git am --keep-cr -s -p1 %s" % patchfile
logger.info("Apply %s" % patchfile )
try:
runcmd(cmd)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 11/35] machine/qemu: set preferred linux-yocto kernel version
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (9 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 10/35] scripts/combo-layer: keep carriage returns at the end of lines Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 12/35] libcap: Update to 2.22 with License Clarification Saul Wold
` (24 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The introduction of the linux-yocto-3.0 kernel is taking
precedence over the known working 2.6.37 version. Forcing
2.6.37 until 3.0 is validated on the qemu machines.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/conf/machine/include/qemu.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 9ef242f..4cab6f3 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -12,6 +12,7 @@ RDEPENDS_kernel-base = ""
# Use a common kernel recipe for all QEMU machines
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "2.6.37+git%"
#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 12/35] libcap: Update to 2.22 with License Clarification
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (10 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 11/35] machine/qemu: set preferred linux-yocto kernel version Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 13/35] libpam: update to 1.1.4 and add subpackage xtests Saul Wold
` (23 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/libcap/libcap.inc | 4 ++--
meta/recipes-support/libcap/libcap_2.20.bb | 6 ------
meta/recipes-support/libcap/libcap_2.22.bb | 6 ++++++
3 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 meta/recipes-support/libcap/libcap_2.20.bb
create mode 100644 meta/recipes-support/libcap/libcap_2.22.bb
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index efa46d6..67f7579 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "support for getting/setting POSIX.1e capabilities"
HOMEPAGE = "http://sites.google.com/site/fullycapable/"
# no specific GPL version required
-LICENSE = "BSD | GPL"
-LIC_FILES_CHKSUM = "file://License;md5=731de803c1ccbcb05a9b3523279c8d7f"
+LICENSE = "BSD | GPLv2"
+LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
DEPENDS = "libpam attr perl-native-runtime"
# attr and pam are disabled by EXTRA_OEMAKE_virtclass-native
diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb
deleted file mode 100644
index a2b49c6..0000000
--- a/meta/recipes-support/libcap/libcap_2.20.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libcap.inc
-
-PR = "r3"
-
-SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
-SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
new file mode 100644
index 0000000..bb49c03
--- /dev/null
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -0,0 +1,6 @@
+require libcap.inc
+
+PR = "r0"
+
+SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
+SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 13/35] libpam: update to 1.1.4 and add subpackage xtests
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (11 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 12/35] libcap: Update to 2.22 with License Clarification Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 14/35] cups: add pam support Saul Wold
` (22 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Update libpam to 1.1.4, and add dependecy cracklib because run xtexts will
need pam-plugin-cracklib.
There are some additional checks under subdirectory xtests and make it
as a subpackage libpam-xtests.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../pam/libpam/libpam-xtests.patch | 35 ++++++++++++++++++++
.../pam/{libpam_1.1.3.bb => libpam_1.1.4.bb} | 14 +++++---
2 files changed, 44 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-extended/pam/libpam/libpam-xtests.patch
rename meta/recipes-extended/pam/{libpam_1.1.3.bb => libpam_1.1.4.bb} (85%)
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
new file mode 100644
index 0000000..be68745
--- /dev/null
+++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
@@ -0,0 +1,35 @@
+This patch is used to create a new sub package libpam-xtests to do more checks.
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <kai.kang@windriver.com>
+--- Linux-PAM-1.1.4/xtests/Makefile.am.orig 2011-07-19 17:00:09.619980001 +0800
++++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800
+@@ -7,7 +7,7 @@
+ AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \
+ -L$(top_builddir)/libpam_misc -lpam_misc
+
+-CLEANFILES = *~ $(XTESTS)
++CLEANFILES = *~
+
+ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
+ tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
+@@ -51,3 +51,18 @@
+
+ xtests: $(XTESTS) run-xtests.sh
+ "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
++
++all: $(XTESTS)
++
++install: install_xtests
++
++install_xtests:
++ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests
++ for file in $(EXTRA_DIST) ; do \
++ $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \
++ done
++ for file in $(XTESTS); do \
++ $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \
++ done
++
++.PHONY: all install_xtests
diff --git a/meta/recipes-extended/pam/libpam_1.1.3.bb b/meta/recipes-extended/pam/libpam_1.1.4.bb
similarity index 85%
rename from meta/recipes-extended/pam/libpam_1.1.3.bb
rename to meta/recipes-extended/pam/libpam_1.1.4.bb
index b62e2f2..59fbdcd 100644
--- a/meta/recipes-extended/pam/libpam_1.1.3.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.4.bb
@@ -11,18 +11,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
PR = "r0"
-DEPENDS = "bison flex"
+DEPENDS = "bison flex cracklib"
RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix"
+RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory \
+ pam-plugin-succeed-if pam-plugin-time coreutils"
RRECOMMENDS_${PN} = "libpam-runtime"
SRC_URI = "${KERNELORG_MIRROR}/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \
file://99_pam \
- file://pam.d/*"
+ file://pam.d/* \
+ file://libpam-xtests.patch"
SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"
-SRC_URI[md5sum] = "6db7fcb5db6253350e3a4648ceac40e7"
-SRC_URI[sha256sum] = "17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652"
+SRC_URI[md5sum] = "e9af5fb27bb22edb55d077e2888b3ebc"
+SRC_URI[sha256sum] = "ccd89331914390b1e9e99c954471d65f19b660d81e15a46eeb96cee125d44056"
EXTRA_OECONF = "--with-db-uniquename=_pam \
--includedir=${includedir}/security \
@@ -34,12 +37,13 @@ S = "${WORKDIR}/Linux-PAM-${PV}"
inherit autotools gettext
-PACKAGES += "${PN}-runtime"
+PACKAGES += "${PN}-runtime ${PN}-xtests"
FILES_${PN} = "${base_libdir}/lib*${SOLIBS}"
FILES_${PN}-dbg += "${base_libdir}/security/.debug \
${base_libdir}/security/pam_filter/.debug"
FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}"
FILES_${PN}-runtime = "${sysconfdir}"
+FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests"
PACKAGES_DYNAMIC += " pam-plugin-*"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 14/35] cups: add pam support
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (12 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 13/35] libpam: update to 1.1.4 and add subpackage xtests Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 15/35] screen: " Saul Wold
` (21 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
According to distro_feature then add pam support for cups or not.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/cups/cups_1.4.6.bb | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index 86b5340..fd20dcc 100644
--- a/meta/recipes-extended/cups/cups_1.4.6.bb
+++ b/meta/recipes-extended/cups/cups_1.4.6.bb
@@ -1,7 +1,8 @@
require cups14.inc
-PR = "r0"
-DEPENDS += "libusb"
+PR = "r1"
+DEPENDS += "libusb \
+ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
SRC_URI += " \
@@ -12,6 +13,7 @@ SRC_URI += " \
SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"
SRC_URI[sha256sum] = "f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514"
-EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb"
+EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 15/35] screen: add pam support
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (13 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 14/35] cups: add pam support Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 16/35] sudo: " Saul Wold
` (20 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
According to DISTRO_FEATURES then add screen pam support or not.
Press "Ctrl+a x" will lock the screen terminal, then unlock it will
use pam.
Add pam related configure file sceen.pam from Fedora.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../screen/screen-4.0.3/screen.pam | 2 +
meta/recipes-extended/screen/screen_4.0.3.bb | 23 +++++++++++++++----
2 files changed, 20 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-extended/screen/screen-4.0.3/screen.pam
diff --git a/meta/recipes-extended/screen/screen-4.0.3/screen.pam b/meta/recipes-extended/screen/screen-4.0.3/screen.pam
new file mode 100644
index 0000000..ff657fa
--- /dev/null
+++ b/meta/recipes-extended/screen/screen-4.0.3/screen.pam
@@ -0,0 +1,2 @@
+#%PAM-1.0
+auth include common-auth
diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb
index dac2893..27f39dd 100644
--- a/meta/recipes-extended/screen/screen_4.0.3.bb
+++ b/meta/recipes-extended/screen/screen_4.0.3.bb
@@ -10,12 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \
file://screen.h;endline=23;md5=9a7ae69a2aafed891bf7c38ddf9f6b7d"
SECTION = "console/utils"
-DEPENDS = "ncurses"
-PR = "r0"
+DEPENDS = "ncurses \
+ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \
${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \
- file://configure.patch"
+ file://configure.patch \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://screen.pam"
SRC_URI[tarball.md5sum] = "8506fd205028a96c741e4037de6e3c42"
SRC_URI[tarball.sha256sum] = "78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77"
@@ -25,5 +29,14 @@ SRC_URI[patch.sha256sum] = "19130d097e9ed897c84a2c640634dd36ee3233c17b0bf5d18549
inherit autotools
-EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5"
-
+EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
+
+do_install_append () {
+ for feature in ${DISTRO_FEATURES}; do
+ if [ "$feature" = "pam" ]; then
+ install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
+ break
+ fi
+ done
+}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 16/35] sudo: add pam support
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (14 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 15/35] screen: " Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 17/35] cronie: enable PAM support for cronie Saul Wold
` (19 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
According to DISTRO_FEATURES to add pam support for sudo, and import
configure file from Fedora.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/sudo/files/sudo.pam | 6 ++++++
meta/recipes-extended/sudo/sudo_1.8.1p2.bb | 18 +++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-extended/sudo/files/sudo.pam
diff --git a/meta/recipes-extended/sudo/files/sudo.pam b/meta/recipes-extended/sudo/files/sudo.pam
new file mode 100644
index 0000000..5bc26e7
--- /dev/null
+++ b/meta/recipes-extended/sudo/files/sudo.pam
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth include common-auth
+account include common-account
+password include common-password
+session required pam_keyinit.so revoke
+session required pam_limits.so
diff --git a/meta/recipes-extended/sudo/sudo_1.8.1p2.bb b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
index 7eba307..9cf9ecc 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.1p2.bb
@@ -1,11 +1,23 @@
require sudo.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
- file://libtool.patch"
+ file://libtool.patch \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://sudo.pam"
SRC_URI[md5sum] = "e8330f0e63b0ecb2e12b5c76922818cc"
SRC_URI[sha256sum] = "281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb"
-EXTRA_OECONF += " --with-pam=no"
+EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"
+
+do_install_append () {
+ for feature in ${DISTRO_FEATURES}; do
+ if [ "$feature" = "pam" ]; then
+ install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo
+ break
+ fi
+ done
+}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 17/35] cronie: enable PAM support for cronie
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (15 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 16/35] sudo: " Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 18/35] shadow: update pam related configure files Saul Wold
` (18 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
Enable PAM support for cronie and update its pam config file 'crond'.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../cronie/cronie/crond_pam_config.patch | 19 +++++++++++++++++++
meta/recipes-extended/cronie/cronie_1.4.7.bb | 12 ++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/cronie/cronie/crond_pam_config.patch
diff --git a/meta/recipes-extended/cronie/cronie/crond_pam_config.patch b/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
new file mode 100644
index 0000000..675872c
--- /dev/null
+++ b/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
@@ -0,0 +1,19 @@
+password-auth is the Fedora's common pam configure file, use oe common pam
+configure files instead.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+--- cronie-1.4.7/pam/crond.orig 2010-12-16 16:59:02.000000000 +0800
++++ cronie-1.4.7/pam/crond 2011-07-20 09:47:16.080819203 +0800
+@@ -4,7 +4,7 @@
+ #
+ # No PAM authentication called, auth modules not needed
+ account required pam_access.so
+-account include password-auth
++account include common-account
+ session required pam_loginuid.so
+-session include password-auth
+-auth include password-auth
++session include common-session-noninteractive
++auth include common-auth
diff --git a/meta/recipes-extended/cronie/cronie_1.4.7.bb b/meta/recipes-extended/cronie/cronie_1.4.7.bb
index 992b610..bb715f2 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.7.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.7.bb
@@ -14,17 +14,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \
SECTION = "utils"
-PR = "r2"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+PR = "r3"
SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
file://crond.init \
- file://crontab"
+ file://crontab \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://crond_pam_config.patch"
+
SRC_URI[md5sum] = "dfc26c47756d0c40ee27ae3c7ee98e0d"
SRC_URI[sha256sum] = "83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd"
inherit autotools update-rc.d
+EXTRA_OECONF += "\
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}"
+
INITSCRIPT_NAME = "crond"
INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 18/35] shadow: update pam related configure files
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (16 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 17/35] cronie: enable PAM support for cronie Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 19/35] at: enable pam support Saul Wold
` (17 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
add shadow-update-pam-conf.patch to update the pam related configure files
in oe way rather than Fedora.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../shadow/files/shadow-update-pam-conf.patch | 91 ++++++++++++++++++++
meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 5 +-
2 files changed, 94 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
new file mode 100644
index 0000000..15f8044
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
@@ -0,0 +1,91 @@
+The system-auth in the configure files is from Fedora which put all the 4 pam type rules
+in one file.
+In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account,
+common-password and common-session.
+So update them with oe way.
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <kai.kang@windriver.com>
+
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chage shadow-4.1.4.3/etc/pam.d/chage
+--- shadow-4.1.4.3/etc/pam.d.orig/chage 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/chage 2011-07-20 19:03:08.964844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chgpasswd shadow-4.1.4.3/etc/pam.d/chgpasswd
+--- shadow-4.1.4.3/etc/pam.d.orig/chgpasswd 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/chgpasswd 2011-07-20 19:03:26.544844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupadd shadow-4.1.4.3/etc/pam.d/groupadd
+--- shadow-4.1.4.3/etc/pam.d.orig/groupadd 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/groupadd 2011-07-20 19:04:08.124844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupdel shadow-4.1.4.3/etc/pam.d/groupdel
+--- shadow-4.1.4.3/etc/pam.d.orig/groupdel 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/groupdel 2011-07-20 19:04:26.114844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmems shadow-4.1.4.3/etc/pam.d/groupmems
+--- shadow-4.1.4.3/etc/pam.d.orig/groupmems 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/groupmems 2011-07-20 19:04:35.074844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmod shadow-4.1.4.3/etc/pam.d/groupmod
+--- shadow-4.1.4.3/etc/pam.d.orig/groupmod 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/groupmod 2011-07-20 19:04:44.864844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/useradd shadow-4.1.4.3/etc/pam.d/useradd
+--- shadow-4.1.4.3/etc/pam.d.orig/useradd 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/useradd 2011-07-20 19:07:26.244844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/userdel shadow-4.1.4.3/etc/pam.d/userdel
+--- shadow-4.1.4.3/etc/pam.d.orig/userdel 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/userdel 2011-07-20 19:07:35.734844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
+diff -Nur shadow-4.1.4.3/etc/pam.d.orig/usermod shadow-4.1.4.3/etc/pam.d/usermod
+--- shadow-4.1.4.3/etc/pam.d.orig/usermod 2011-07-20 19:02:27.384844958 +0800
++++ shadow-4.1.4.3/etc/pam.d/usermod 2011-07-20 19:07:42.024844958 +0800
+@@ -1,4 +1,4 @@
+ #%PAM-1.0
+ auth sufficient pam_rootok.so
+ account required pam_permit.so
+-password include system-auth
++password include common-password
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 5731a26..70d4cbb 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2 \
file://login_defs_pam.sed \
@@ -19,7 +19,8 @@ SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz
file://shadow-4.1.3-dots-in-usernames.patch \
file://shadow-4.1.4.2-env-reset-keep-locale.patch \
file://shadow-4.1.4.2-groupmod-pam-check.patch \
- file://shadow-4.1.4.2-su_no_sanitize_env.patch"
+ file://shadow-4.1.4.2-su_no_sanitize_env.patch \
+ file://shadow-update-pam-conf.patch"
SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 19/35] at: enable pam support
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (17 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 18/35] shadow: update pam related configure files Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 20/35] openssh: Support PAM Saul Wold
` (16 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
add patches to make at enable pam support
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../at/at-3.1.12/configure-add-enable-pam.patch | 23 ++++++++++++++++++++
meta/recipes-extended/at/at-3.1.12/pam.conf.patch | 21 ++++++++++++++++++
meta/recipes-extended/at/at_3.1.12.bb | 21 ++++++++++++++---
3 files changed, 61 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch
create mode 100644 meta/recipes-extended/at/at-3.1.12/pam.conf.patch
diff --git a/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch b/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch
new file mode 100644
index 0000000..1f73cdd
--- /dev/null
+++ b/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch
@@ -0,0 +1,23 @@
+--- at-3.1.12/configure.ac 2011-06-23 14:51:03.653572945 +0800
++++ at-3.1.12/configure.ac.new 2011-06-27 16:12:14.903572945 +0800
+@@ -81,10 +81,18 @@
+ AC_FUNC_VPRINTF
+ AC_FUNC_GETLOADAVG
+ AC_CHECK_FUNCS(getcwd mktime strftime setreuid setresuid sigaction waitpid)
++
++AC_ARG_WITH([pam],
++ [AS_HELP_STRING([--without-pam], [without PAM support])])
++
++if test "x$with_pam" != xno; then
+ AC_CHECK_HEADERS(security/pam_appl.h, [
+ PAMLIB="-lpam"
+- AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])
+-])
++ AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])],
++ [if test "x$with_pam" = xyes; then
++ AC_MSG_ERROR([PAM selected but security/pam_misc.h not found])
++ fi])
++fi
+
+ dnl Checking for programs
+
diff --git a/meta/recipes-extended/at/at-3.1.12/pam.conf.patch b/meta/recipes-extended/at/at-3.1.12/pam.conf.patch
new file mode 100644
index 0000000..dfe76d7
--- /dev/null
+++ b/meta/recipes-extended/at/at-3.1.12/pam.conf.patch
@@ -0,0 +1,21 @@
+oe doesn't support "@include", use the concrete directive instead.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+--- at-3.1.12/pam.conf.orig 2009-11-23 23:11:52.000000000 +0800
++++ at-3.1.12/pam.conf 2011-07-15 11:14:04.132818950 +0800
+@@ -2,8 +2,8 @@
+ # The PAM configuration file for the at daemon
+ #
+
+-auth required pam_env.so
+-@include common-auth
+-@include common-account
+-@include common-session-noninteractive
+-session required pam_limits.so
++auth required pam_env.so
++auth include common-auth
++account include common-account
++session include common-session-noninteractive
++session required pam_limits.so
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index 3a94497..c76b50e 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -4,10 +4,11 @@ the system load levels drop to a particular level."
SECTION = "base"
LICENSE="GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
-DEPENDS = "flex libpam initscripts"
+DEPENDS = "flex libpam initscripts \
+ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
-PR = "r4"
+PR = "r5"
SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://configure.patch \
@@ -17,7 +18,11 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://posixtm.c \
file://posixtm.h \
file://file_replacement_with_gplv2.patch \
- file://S99at"
+ file://S99at \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://pam.conf.patch \
+ file://configure-add-enable-pam.patch"
SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765"
SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3"
@@ -26,7 +31,8 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
--with-daemon_username=root \
--with-daemon_groupname=root \
--with-jobdir=/var/spool/at/jobs \
- --with-atspool=/var/spool/at/spool"
+ --with-atspool=/var/spool/at/spool \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} "
inherit autotools
@@ -41,6 +47,13 @@ do_install () {
install -d ${D}${sysconfdir}/rcS.d
install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd
ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
+
+ for feature in ${DISTRO_FEATURES}; do
+ if [ "$feature" = "pam" ]; then
+ install -D -m 0644 ${WORKDIR}/${P}/pam.conf ${D}${sysconfdir}/pam.d/atd
+ break
+ fi
+ done
}
pkg_postinst_${PN} () {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 20/35] openssh: Support PAM
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (18 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 19/35] at: enable pam support Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 21/35] dropbear: Support pam Saul Wold
` (15 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Adding configuration file "sshd" in /etc/pam.d/ for supporting pam.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../openssh/openssh-5.8p2/sshd | 10 ++++++++++
meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 13 +++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
diff --git a/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
new file mode 100644
index 0000000..4882e58
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
@@ -0,0 +1,10 @@
+#%PAM-1.0
+
+auth include common-auth
+account required pam_nologin.so
+account include common-account
+password include common-password
+session optional pam_keyinit.so force revoke
+session include common-session
+session required pam_loginuid.so
+
diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
index e23069c..89b011d 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
-PR = "r0"
+PR = "r1"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -23,7 +23,9 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://sshd_config \
file://ssh_config \
file://init \
- "
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://sshd"
SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
@@ -58,6 +60,13 @@ do_compile_append () {
}
do_install_append () {
+ for i in ${DISTRO_FEATURES};
+ do
+ if [ ${i} = "pam" ]; then
+ install -d ${D}${sysconfdir}/pam.d
+ install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
+ fi
+ done
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
mv ${D}${bindir}/scp ${D}${bindir}/scp.${PN}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 21/35] dropbear: Support pam
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (19 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 20/35] openssh: Support PAM Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 22/35] polkit: " Saul Wold
` (14 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
I make a patch and some changes in dropbear.inc for supporting pam.
- Enable pam in configure
- Modify file option.h to open pam supporting
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-core/dropbear/dropbear.inc | 8 ++++++-
.../dropbear/dropbear/dropbear-enable-pam.patch | 22 ++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 526a5a0..5af9ebd 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -9,13 +9,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c"
DEPENDS = "zlib"
RPROVIDES = "ssh sshd"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
file://urandom-xauth-changes-to-options.h.patch \
file://configure.patch \
file://fix-2kb-keys.patch \
file://allow-nopw.patch;apply=no \
- file://init"
+ file://init \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
+
+PAM_SRC_URI = "file://dropbear-enable-pam.patch"
inherit autotools update-rc.d
@@ -28,6 +32,8 @@ LD = "${CC}"
SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
BINCOMMANDS = "dbclient ssh scp"
EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
+EXTRA_OECONF += "\
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch
new file mode 100644
index 0000000..004d773
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch
@@ -0,0 +1,22 @@
+dropbear: We need modify file option.h besides enabling pam in \
+configure if we want dropbear to support pam.
+
+Upstream-Status: Pending
+
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+
+--- a/options.h 2011-07-12 13:27:39.008819183 +0800
++++ b/options.h.new 2011-07-12 13:37:37.780819308 +0800
+@@ -149,9 +149,9 @@
+ * but there's an interface via a PAM module - don't bother using it otherwise.
+ * You can't enable both PASSWORD and PAM. */
+
+-#define ENABLE_SVR_PASSWORD_AUTH
++//#define ENABLE_SVR_PASSWORD_AUTH
+ /* PAM requires ./configure --enable-pam */
+-/*#define ENABLE_SVR_PAM_AUTH*/
++#define ENABLE_SVR_PAM_AUTH
+ #define ENABLE_SVR_PUBKEY_AUTH
+
+ /* Wether to ake public key options in authorized_keys file into account */
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 22/35] polkit: Support pam
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (20 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 21/35] dropbear: Support pam Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 23/35] siteinfo: Move certain samba entries to common-linux Saul Wold
` (13 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Modify configuration "polkit-1" in /etc/pam.d/ for supporting pam.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../polkit/polkit-0.101/polkit-1_pam.patch | 23 ++++++++++++++++++++
meta/recipes-extended/polkit/polkit_0.101.bb | 7 ++++-
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
new file mode 100644
index 0000000..74647ef
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
@@ -0,0 +1,23 @@
+polkit: No system-auth in OE-Core, we can use common-* in place of it.
+
+Upstream-Status:Inappropriate [configuration]
+
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+
+--- a/configure.ac 2011-03-04 02:26:20.000000000 +0800
++++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800
+@@ -350,10 +350,10 @@
+ PAM_FILE_INCLUDE_PASSWORD=system
+ PAM_FILE_INCLUDE_SESSION=system
+ else
+- PAM_FILE_INCLUDE_AUTH=system-auth
+- PAM_FILE_INCLUDE_ACCOUNT=system-auth
+- PAM_FILE_INCLUDE_PASSWORD=system-auth
+- PAM_FILE_INCLUDE_SESSION=system-auth
++ PAM_FILE_INCLUDE_AUTH=common-auth
++ PAM_FILE_INCLUDE_ACCOUNT=common-account
++ PAM_FILE_INCLUDE_PASSWORD=common-password
++ PAM_FILE_INCLUDE_SESSION=common-session
+ fi
+
+ AC_SUBST(PAM_FILE_INCLUDE_AUTH)
diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
index 6769914..56ceca4 100644
--- a/meta/recipes-extended/polkit/polkit_0.101.bb
+++ b/meta/recipes-extended/polkit/polkit_0.101.bb
@@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
- file://introspection.patch"
-PR = "r0"
+ file://introspection.patch \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+
+PAM_SRC_URI = "file://polkit-1_pam.patch"
+PR = "r1"
DEPENDS = "libpam expat dbus-glib eggdbus intltool"
RDEPENDS_${PN} = "libpam"
EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 23/35] siteinfo: Move certain samba entries to common-linux
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (21 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 22/35] polkit: " Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 24/35] siteinfo: Move certain bash " Saul Wold
` (12 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
Part of re-syncing with oe.dev, move samba_cv_HAVE_IFACE_* to common-linux
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-linux | 4 ----
meta/site/arm-linux-uclibc | 4 ----
meta/site/armeb-linux | 2 --
meta/site/armeb-linux-uclibc | 2 --
meta/site/common-linux | 5 +++++
meta/site/mipsel-linux-uclibc | 3 ---
meta/site/powerpc32-linux | 3 ---
meta/site/sh-common | 2 --
8 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/meta/site/arm-linux b/meta/site/arm-linux
index 033366a..cb3bcbb 100644
--- a/meta/site/arm-linux
+++ b/meta/site/arm-linux
@@ -60,13 +60,10 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no}
samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
-samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
samba_cv_HAVE_MAKEDEV=${samba_cv_HAVE_MAKEDEV=yes}
@@ -145,7 +142,6 @@ samba_cv_unixsocket=${samba_cv_unixsocket=yes}
samba_cv_volatile=${samba_cv_volatile=yes}
#older sambe defines
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc
index 2933c3f..55cd68e 100644
--- a/meta/site/arm-linux-uclibc
+++ b/meta/site/arm-linux-uclibc
@@ -44,14 +44,10 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no}
samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no}
-samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
-samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes}
diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux
index c852f00..d8da123 100644
--- a/meta/site/armeb-linux
+++ b/meta/site/armeb-linux
@@ -31,8 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc
index 02c63e4..5e86009 100644
--- a/meta/site/armeb-linux-uclibc
+++ b/meta/site/armeb-linux-uclibc
@@ -31,8 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/meta/site/common-linux b/meta/site/common-linux
index e69de29..c37c76a 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -0,0 +1,5 @@
+# samba
+samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
+samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
+samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
+samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc
index f36a30a..9545fea 100644
--- a/meta/site/mipsel-linux-uclibc
+++ b/meta/site/mipsel-linux-uclibc
@@ -93,10 +93,7 @@ samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPP
samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
-samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index 33ad786..5d92ecf 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -272,9 +272,6 @@ samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes}
samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index e8228fd..9368444 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -84,8 +84,6 @@ ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 24/35] siteinfo: Move certain bash entries to common-linux
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (22 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 23/35] siteinfo: Move certain samba entries to common-linux Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 9:44 ` Phil Blundell
2011-07-27 7:47 ` [Consolidated & Tested 25/35] x86_64-linux siteinfo: Add bash info Saul Wold
` (11 subsequent siblings)
35 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
More re-sync with oe.dev
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-common | 14 --------------
meta/site/common-linux | 16 ++++++++++++++++
meta/site/ix86-common | 14 --------------
meta/site/mips-linux | 3 ---
meta/site/mips-linux-uclibc | 3 ---
meta/site/mipsel-linux | 14 --------------
meta/site/mipsel-linux-uclibc | 14 --------------
meta/site/powerpc-linux | 3 ---
meta/site/powerpc32-linux | 13 -------------
meta/site/sh-common | 14 --------------
meta/site/sparc-linux | 3 ---
meta/site/x86_64-linux | 1 -
meta/site/x86_64-linux-uclibc | 1 -
13 files changed, 16 insertions(+), 97 deletions(-)
diff --git a/meta/site/arm-common b/meta/site/arm-common
index 5d3e68a..39eb30b 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -14,21 +14,7 @@ apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=yes}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
-bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
-bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
-bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
-bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
-bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
-bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
-bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
-bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
-bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
-bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
-bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
-bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
-bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# coreutils
utils_cv_sys_open_max=${utils_cv_sys_open_max=1019}
diff --git a/meta/site/common-linux b/meta/site/common-linux
index c37c76a..74a822d 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -3,3 +3,19 @@ samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
+
+# bash
+bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
+bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
+bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
+bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
+bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
+bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
+bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
+bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
+bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
+bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
+bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
+bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
+bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
+bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index 4a4442a..267d59f 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -58,21 +58,7 @@ ac_cv_file_lib_src_libmad_frame_h=${ac_cv_file_lib_src_libmad_frame_h=no}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=yes}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
-bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
-bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
-bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
-bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
-bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
-bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
-bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
-bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
-bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
-bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
-bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
-bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
-bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# clamav
clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
diff --git a/meta/site/mips-linux b/meta/site/mips-linux
index 074cb09..495df5f 100644
--- a/meta/site/mips-linux
+++ b/meta/site/mips-linux
@@ -118,9 +118,6 @@ mono_cv_uscore=${mono_cv_uscore=no}
ac_cv_va_copy=${ac_cv_va_copy=yes}
ac_cv___va_copy=${ac_cv___va_copy=yes}
-# readline
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
-
# eds-dbus
ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
index 074cb09..495df5f 100644
--- a/meta/site/mips-linux-uclibc
+++ b/meta/site/mips-linux-uclibc
@@ -118,9 +118,6 @@ mono_cv_uscore=${mono_cv_uscore=no}
ac_cv_va_copy=${ac_cv_va_copy=yes}
ac_cv___va_copy=${ac_cv___va_copy=yes}
-# readline
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
-
# eds-dbus
ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux
index c20e5ee..0959883 100644
--- a/meta/site/mipsel-linux
+++ b/meta/site/mipsel-linux
@@ -8,21 +8,7 @@ ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
-bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
-bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
-bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
-bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
-bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
-bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
-bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
-bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
-bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
-bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
-bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
-bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
-bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# openssh
ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc
index 9545fea..25fa8b5 100644
--- a/meta/site/mipsel-linux-uclibc
+++ b/meta/site/mipsel-linux-uclibc
@@ -8,21 +8,7 @@ ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
-bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
-bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
-bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
-bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
-bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
-bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
-bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
-bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
-bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
-bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
-bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
-bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
-bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# openssh
ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
diff --git a/meta/site/powerpc-linux b/meta/site/powerpc-linux
index 9498b8a..399a58e 100644
--- a/meta/site/powerpc-linux
+++ b/meta/site/powerpc-linux
@@ -4,9 +4,6 @@ ac_cv_func_setgrent_void=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
-# bash
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
-
# startup-notification
lf_cv_sane_realloc=yes
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index 5d92ecf..9d89f73 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -205,19 +205,6 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=yes}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
-bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
-bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
-bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
-bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
-bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
-bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
-bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
-bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
-bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
-bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
-bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
-bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
-bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# openssh
ac_cv_have_broken_dirname=${ac_cv_have_broken_dirname='yes'}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index 9368444..196af11 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -222,21 +222,7 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=yes}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
-bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
-bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
-bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
-bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
-bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
-bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
-bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
-bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
-bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
-bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
-bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
-bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
-bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# mono
cv_mono_sizeof_sunpath=108
diff --git a/meta/site/sparc-linux b/meta/site/sparc-linux
index 491dc74..ea6386b 100644
--- a/meta/site/sparc-linux
+++ b/meta/site/sparc-linux
@@ -53,6 +53,3 @@ glib_cv_stack_grows=${glib_cv_stack_grows=no}
#linux
ac_cv_linux_vers=${ac_cv_linux_vers=2}
-
-#bash
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
index 9c9e0f8..ba6e57c 100644
--- a/meta/site/x86_64-linux
+++ b/meta/site/x86_64-linux
@@ -32,7 +32,6 @@ ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=8}
ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long long'}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
diff --git a/meta/site/x86_64-linux-uclibc b/meta/site/x86_64-linux-uclibc
index d0d0f32..771e725 100644
--- a/meta/site/x86_64-linux-uclibc
+++ b/meta/site/x86_64-linux-uclibc
@@ -24,7 +24,6 @@ ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=8}
ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=8}
ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
-bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long long'}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 24/35] siteinfo: Move certain bash entries to common-linux
2011-07-27 7:47 ` [Consolidated & Tested 24/35] siteinfo: Move certain bash " Saul Wold
@ 2011-07-27 9:44 ` Phil Blundell
2011-07-27 10:47 ` Richard Purdie
2011-07-27 15:35 ` Tom Rini
0 siblings, 2 replies; 51+ messages in thread
From: Phil Blundell @ 2011-07-27 9:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
> diff --git a/meta/site/arm-common b/meta/site/arm-common
> index 5d3e68a..39eb30b 100644
> --- a/meta/site/arm-common
> +++ b/meta/site/arm-common
> @@ -14,21 +14,7 @@ apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
>
> # bash
> ac_cv_c_long_double=${ac_cv_c_long_double=yes}
> -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
> bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
That sigsetjmp thing looks pretty bogus to me. sigsetjmp() is POSIX.1;
it isn't (shouldn't be) architecture specific in any way, and both
eglibc and uclibc implement it nowadays. I think you should probably
have sigsetjmp=present in linux-common.
p.
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 24/35] siteinfo: Move certain bash entries to common-linux
2011-07-27 9:44 ` Phil Blundell
@ 2011-07-27 10:47 ` Richard Purdie
2011-07-27 15:35 ` Tom Rini
1 sibling, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-07-27 10:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 10:44 +0100, Phil Blundell wrote:
> On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
> > diff --git a/meta/site/arm-common b/meta/site/arm-common
> > index 5d3e68a..39eb30b 100644
> > --- a/meta/site/arm-common
> > +++ b/meta/site/arm-common
> > @@ -14,21 +14,7 @@ apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
> >
> > # bash
> > ac_cv_c_long_double=${ac_cv_c_long_double=yes}
> > -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
> > bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
>
> That sigsetjmp thing looks pretty bogus to me. sigsetjmp() is POSIX.1;
> it isn't (shouldn't be) architecture specific in any way, and both
> eglibc and uclibc implement it nowadays. I think you should probably
> have sigsetjmp=present in linux-common.
This is tangential to this patch, could you send one handling that issue
please? :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 24/35] siteinfo: Move certain bash entries to common-linux
2011-07-27 9:44 ` Phil Blundell
2011-07-27 10:47 ` Richard Purdie
@ 2011-07-27 15:35 ` Tom Rini
2011-07-27 15:52 ` Phil Blundell
1 sibling, 1 reply; 51+ messages in thread
From: Tom Rini @ 2011-07-27 15:35 UTC (permalink / raw)
To: openembedded-core
On 07/27/2011 02:44 AM, Phil Blundell wrote:
> On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
>> diff --git a/meta/site/arm-common b/meta/site/arm-common
>> index 5d3e68a..39eb30b 100644
>> --- a/meta/site/arm-common
>> +++ b/meta/site/arm-common
>> @@ -14,21 +14,7 @@ apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
>>
>> # bash
>> ac_cv_c_long_double=${ac_cv_c_long_double=yes}
>> -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
>> bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
>
> That sigsetjmp thing looks pretty bogus to me. sigsetjmp() is POSIX.1;
> it isn't (shouldn't be) architecture specific in any way, and both
> eglibc and uclibc implement it nowadays. I think you should probably
> have sigsetjmp=present in linux-common.
Agreed that we're far from complete here. oe.dev has this one done and
once I've got the rest of the oe.dev re-sync done I'm just going to wipe
the site files clean and see what's needed anywhere, really.
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 24/35] siteinfo: Move certain bash entries to common-linux
2011-07-27 15:35 ` Tom Rini
@ 2011-07-27 15:52 ` Phil Blundell
2011-07-27 15:55 ` Tom Rini
0 siblings, 1 reply; 51+ messages in thread
From: Phil Blundell @ 2011-07-27 15:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 08:35 -0700, Tom Rini wrote:
> Agreed that we're far from complete here. oe.dev has this one done and
> once I've got the rest of the oe.dev re-sync done I'm just going to wipe
> the site files clean and see what's needed anywhere, really.
Out of interest, why are you doing the resync first? It seems like it
would be a better use of time to wipe the site files clean and see which
bits we need before spending time on syncing them up.
p.
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [Consolidated & Tested 24/35] siteinfo: Move certain bash entries to common-linux
2011-07-27 15:52 ` Phil Blundell
@ 2011-07-27 15:55 ` Tom Rini
0 siblings, 0 replies; 51+ messages in thread
From: Tom Rini @ 2011-07-27 15:55 UTC (permalink / raw)
To: openembedded-core
On 07/27/2011 08:52 AM, Phil Blundell wrote:
> On Wed, 2011-07-27 at 08:35 -0700, Tom Rini wrote:
>> Agreed that we're far from complete here. oe.dev has this one done and
>> once I've got the rest of the oe.dev re-sync done I'm just going to wipe
>> the site files clean and see what's needed anywhere, really.
>
> Out of interest, why are you doing the resync first? It seems like it
> would be a better use of time to wipe the site files clean and see which
> bits we need before spending time on syncing them up.
Partly to go from something working to something working better and
partly since I didn't realize just how bad things were until I started
digging.
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 51+ messages in thread
* [Consolidated & Tested 25/35] x86_64-linux siteinfo: Add bash info
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (23 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 24/35] siteinfo: Move certain bash " Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 26/35] siteinfo: Move certain mysql entries to common-linux Saul Wold
` (10 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
Taken from oe.dev
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/x86_64-linux | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
index ba6e57c..076e5b6 100644
--- a/meta/site/x86_64-linux
+++ b/meta/site/x86_64-linux
@@ -89,6 +89,11 @@ ac_cv_lib_m_sin=${ac_cv_lib_m_sin=yes}
#orbit
libIDL_cv_long_long_format=ll
+
+# bash
+bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
+
+# ORBit2
ac_cv_alignof_CORBA_boolean=1
ac_cv_alignof_CORBA_char=1
ac_cv_alignof_CORBA_double=8
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 26/35] siteinfo: Move certain mysql entries to common-linux
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (24 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 25/35] x86_64-linux siteinfo: Add bash info Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry " Saul Wold
` (9 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
More re-sync with oe.dev
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-common | 1 -
meta/site/arm-linux | 1 -
meta/site/arm-linux-uclibc | 1 -
meta/site/armeb-linux | 1 -
meta/site/armeb-linux-uclibc | 1 -
meta/site/common-linux | 4 ++++
meta/site/ix86-common | 3 ---
meta/site/powerpc32-linux | 2 --
meta/site/sh-common | 2 --
meta/site/sparc-linux | 1 -
10 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/meta/site/arm-common b/meta/site/arm-common
index 39eb30b..2880cfc 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -138,7 +138,6 @@ cv_mono_sizeof_sunpath=108
# mysql
mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no}
mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no}
-ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# nano
ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no}
diff --git a/meta/site/arm-linux b/meta/site/arm-linux
index cb3bcbb..96a1dde 100644
--- a/meta/site/arm-linux
+++ b/meta/site/arm-linux
@@ -34,7 +34,6 @@ ac_cv_sizeof_unsigned_long=${ac_cv_sizeof_unsigned_long=4}
ac_cv_sizeof_unsigned_long_long=${ac_cv_sizeof_unsigned_long_long=8}
ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc
index 55cd68e..017594d 100644
--- a/meta/site/arm-linux-uclibc
+++ b/meta/site/arm-linux-uclibc
@@ -18,7 +18,6 @@ ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux
index d8da123..45fa692 100644
--- a/meta/site/armeb-linux
+++ b/meta/site/armeb-linux
@@ -21,7 +21,6 @@ ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
ac_cv_sizeof_unsigned=${ac_cv_sizeof_unsigned=4}
ac_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc
index 5e86009..50874c4 100644
--- a/meta/site/armeb-linux-uclibc
+++ b/meta/site/armeb-linux-uclibc
@@ -21,7 +21,6 @@ ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
ac_cv_sizeof_unsigned=${ac_cv_sizeof_unsigned=4}
ac_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
diff --git a/meta/site/common-linux b/meta/site/common-linux
index 74a822d..7cdfb63 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -19,3 +19,7 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
+
+# mysql
+ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
+ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index 267d59f..cacf7ee 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -47,7 +47,6 @@ lf_cv_sane_realloc=yes
jm_cv_func_gettimeofday_clobber=no
samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
bf_lsbf=1
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
@@ -126,7 +125,6 @@ glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# guile
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
@@ -165,7 +163,6 @@ cv_mono_sizeof_sunpath=108
# mysql
mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=yes}
mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=yes}
-ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# ORBit2
ac_cv_alignof_CORBA_boolean=1
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index 9d89f73..3a05053 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -28,7 +28,6 @@ ac_cv_sizeof_unsigned_short=${ac_cv_sizeof_unsigned_short=2}
ac_cv_sizeof_unsigned_short_int=${ac_cv_sizeof_unsigned_short_int=2}
ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=4}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_type___int64=${ac_cv_type___int64=no}
ac_cv_type_size_t=${ac_cv_type_size_t=yes}
ac_cv_type_void_p=${ac_cv_type_void_p=yes}
@@ -296,7 +295,6 @@ ac_cv_sync_with_stdio_2=${ac_cv_sync_with_stdio_2=yes}
# mysql
mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no}
mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no}
-ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# sudo
sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index 196af11..7fe36cc 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -24,7 +24,6 @@ ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1}
# lzo
ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
@@ -230,7 +229,6 @@ cv_mono_sizeof_sunpath=108
# mysql
mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no}
mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no}
-ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
# rp-pppoe
rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
diff --git a/meta/site/sparc-linux b/meta/site/sparc-linux
index ea6386b..f4c221c 100644
--- a/meta/site/sparc-linux
+++ b/meta/site/sparc-linux
@@ -29,7 +29,6 @@ ac_cv_alignof_CORBA_long_double=4
ac_cv_c_long_double=${ac_cv_c_long_double=yes}
-ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry to common-linux
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (25 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 26/35] siteinfo: Move certain mysql entries to common-linux Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 9:47 ` Phil Blundell
2011-07-27 7:47 ` [Consolidated & Tested 28/35] siteinfo: Move certain db entries " Saul Wold
` (8 subsequent siblings)
35 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
More oe.dev re-sync.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-linux | 3 ---
meta/site/common-linux | 3 +++
meta/site/ix86-common | 3 ---
meta/site/mips-linux | 3 ---
meta/site/mips-linux-uclibc | 3 ---
meta/site/mipsel-linux | 3 ---
meta/site/mipsel-linux-uclibc | 2 --
meta/site/sh-common | 3 ---
8 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/meta/site/arm-linux b/meta/site/arm-linux
index 96a1dde..1211ad4 100644
--- a/meta/site/arm-linux
+++ b/meta/site/arm-linux
@@ -171,6 +171,3 @@ ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes}
ac_cv_member_struct_sockaddr_sa_len=${ac_cv_member_struct_sockaddr_sa_len=no}
ac_cv_gnet_have_abstract_sockets=${ac_cv_gnet_have_abstract_sockets=no}
gnet_sockaddr_family_field_name=${gnet_sockaddr_family_field_name=ss_family}
-
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
diff --git a/meta/site/common-linux b/meta/site/common-linux
index 7cdfb63..981100c 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
# mysql
ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
+
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index cacf7ee..fa32bb2 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -187,9 +187,6 @@ ac_cv_pread=${ac_cv_pread=no}
ac_cv_pwrite=${ac_cv_pwrite=no}
php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes}
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
-
# rsync
rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no}
rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes}
diff --git a/meta/site/mips-linux b/meta/site/mips-linux
index 495df5f..f6442ce 100644
--- a/meta/site/mips-linux
+++ b/meta/site/mips-linux
@@ -63,9 +63,6 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
-
# db3
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
index 495df5f..f6442ce 100644
--- a/meta/site/mips-linux-uclibc
+++ b/meta/site/mips-linux-uclibc
@@ -63,9 +63,6 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
-
# db3
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux
index 0959883..76c0dc0 100644
--- a/meta/site/mipsel-linux
+++ b/meta/site/mipsel-linux
@@ -64,9 +64,6 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
-
# db3
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc
index 25fa8b5..838bdff 100644
--- a/meta/site/mipsel-linux-uclibc
+++ b/meta/site/mipsel-linux-uclibc
@@ -113,5 +113,3 @@ samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_4A.c}
# doesn't cache it.
samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index 7fe36cc..b6b0bf5 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -230,9 +230,6 @@ cv_mono_sizeof_sunpath=108
mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no}
mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no}
-# rp-pppoe
-rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
-
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry to common-linux
2011-07-27 7:47 ` [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry " Saul Wold
@ 2011-07-27 9:47 ` Phil Blundell
2011-07-27 15:36 ` Tom Rini
0 siblings, 1 reply; 51+ messages in thread
From: Phil Blundell @ 2011-07-27 9:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
> --- a/meta/site/common-linux
> +++ b/meta/site/common-linux
> @@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
> # mysql
> ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
> ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
> +
> +# rp-pppoe
> +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
Per previous discussion, I am pretty sure this is wrong.
p.
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry to common-linux
2011-07-27 9:47 ` Phil Blundell
@ 2011-07-27 15:36 ` Tom Rini
2011-07-27 15:40 ` Richard Purdie
0 siblings, 1 reply; 51+ messages in thread
From: Tom Rini @ 2011-07-27 15:36 UTC (permalink / raw)
To: openembedded-core
On 07/27/2011 02:47 AM, Phil Blundell wrote:
> On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
>> --- a/meta/site/common-linux
>> +++ b/meta/site/common-linux
>> @@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
>> # mysql
>> ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
>> ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
>> +
>> +# rp-pppoe
>> +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
>
> Per previous discussion, I am pretty sure this is wrong.
Agreed. This is actually fixed right now in meta-oe and doesn't belong
in oe-core (until someone argues rp-pppoe needs to be in oe-core).
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry to common-linux
2011-07-27 15:36 ` Tom Rini
@ 2011-07-27 15:40 ` Richard Purdie
2011-07-27 15:43 ` Tom Rini
0 siblings, 1 reply; 51+ messages in thread
From: Richard Purdie @ 2011-07-27 15:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 08:36 -0700, Tom Rini wrote:
> On 07/27/2011 02:47 AM, Phil Blundell wrote:
> > On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
> >> --- a/meta/site/common-linux
> >> +++ b/meta/site/common-linux
> >> @@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
> >> # mysql
> >> ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
> >> ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
> >> +
> >> +# rp-pppoe
> >> +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
> >
> > Per previous discussion, I am pretty sure this is wrong.
>
> Agreed. This is actually fixed right now in meta-oe and doesn't belong
> in oe-core (until someone argues rp-pppoe needs to be in oe-core).
Can someone send me the removal patch please? :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry to common-linux
2011-07-27 15:40 ` Richard Purdie
@ 2011-07-27 15:43 ` Tom Rini
2011-07-27 15:47 ` Tom Rini
0 siblings, 1 reply; 51+ messages in thread
From: Tom Rini @ 2011-07-27 15:43 UTC (permalink / raw)
To: openembedded-core
On 07/27/2011 08:40 AM, Richard Purdie wrote:
> On Wed, 2011-07-27 at 08:36 -0700, Tom Rini wrote:
>> On 07/27/2011 02:47 AM, Phil Blundell wrote:
>>> On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
>>>> --- a/meta/site/common-linux
>>>> +++ b/meta/site/common-linux
>>>> @@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
>>>> # mysql
>>>> ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
>>>> ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
>>>> +
>>>> +# rp-pppoe
>>>> +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
>>>
>>> Per previous discussion, I am pretty sure this is wrong.
>>
>> Agreed. This is actually fixed right now in meta-oe and doesn't belong
>> in oe-core (until someone argues rp-pppoe needs to be in oe-core).
>
> Can someone send me the removal patch please? :)
I've got another pile of these siteinfo bits waiting on the first pile
going in. I'll add dropping this in my next pile.
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry to common-linux
2011-07-27 15:43 ` Tom Rini
@ 2011-07-27 15:47 ` Tom Rini
0 siblings, 0 replies; 51+ messages in thread
From: Tom Rini @ 2011-07-27 15:47 UTC (permalink / raw)
To: openembedded-core
On 07/27/2011 08:43 AM, Tom Rini wrote:
> On 07/27/2011 08:40 AM, Richard Purdie wrote:
>> On Wed, 2011-07-27 at 08:36 -0700, Tom Rini wrote:
>>> On 07/27/2011 02:47 AM, Phil Blundell wrote:
>>>> On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
>>>>> --- a/meta/site/common-linux
>>>>> +++ b/meta/site/common-linux
>>>>> @@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
>>>>> # mysql
>>>>> ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
>>>>> ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
>>>>> +
>>>>> +# rp-pppoe
>>>>> +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
>>>>
>>>> Per previous discussion, I am pretty sure this is wrong.
>>>
>>> Agreed. This is actually fixed right now in meta-oe and doesn't belong
>>> in oe-core (until someone argues rp-pppoe needs to be in oe-core).
>>
>> Can someone send me the removal patch please? :)
>
> I've got another pile of these siteinfo bits waiting on the first pile
> going in. I'll add dropping this in my next pile.
And, it's harmless for the wrong one to be in oe-core as the meta-oe
sitefile wins.
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 51+ messages in thread
* [Consolidated & Tested 28/35] siteinfo: Move certain db entries to common-linux
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (26 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 27/35] siteinfo: Move the rp-pppoe entry " Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 29/35] siteinfo: Move general realloc/malloc values to common-$libc Saul Wold
` (7 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
Note that we had a number of unused and ignored settings wrt mutex
support. These have been dropped as they weren't being used and
implied some odd things to boot. This is also a partial resync with
oe.dev which had some, but not all of these changes.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-common | 12 ------------
meta/site/common-linux | 11 +++++++++++
meta/site/ix86-common | 12 ------------
meta/site/mips-linux | 14 +-------------
meta/site/mips-linux-uclibc | 14 +-------------
meta/site/mipsel-linux | 14 +-------------
meta/site/powerpc32-linux | 14 +-------------
meta/site/sh-common | 14 +-------------
meta/site/x86_64-linux | 14 ++------------
meta/site/x86_64-linux-uclibc | 12 ------------
10 files changed, 18 insertions(+), 113 deletions(-)
diff --git a/meta/site/arm-common b/meta/site/arm-common
index 2880cfc..2524db4 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -25,20 +25,8 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
# db (sleepycat)
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
-db_cv_mutex=${db_cv_mutex=no}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
-db_cv_uimutexes=${db_cv_uimutexes=no}
# D-BUS
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
diff --git a/meta/site/common-linux b/meta/site/common-linux
index 981100c..1b4d182 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -4,6 +4,17 @@ samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
+# db
+db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
+db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
+db_cv_path_cp=${db_cv_path_cp=/bin/cp}
+db_cv_path_ln=${db_cv_path_ln=/bin/ln}
+db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
+db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
+db_cv_path_rm=${db_cv_path_rm=/bin/rm}
+db_cv_path_sh=${db_cv_path_sh=/bin/sh}
+db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
+
# bash
bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index fa32bb2..47f7178 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -72,19 +72,7 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
-db_cv_mutex=${db_cv_mutex=x86/gcc-assembly}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_uimutexes=${db_cv_uimutexes=no}
# D-BUS
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
diff --git a/meta/site/mips-linux b/meta/site/mips-linux
index f6442ce..f81d4fa 100644
--- a/meta/site/mips-linux
+++ b/meta/site/mips-linux
@@ -63,23 +63,11 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
-# db3
+# db
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
-db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
-db_cv_uimutexes=${db_cv_uimutexes=no}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
# rrdtool
rd_cv_ieee_works=${rd_cv_ieee_works=yes}
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
index f6442ce..f81d4fa 100644
--- a/meta/site/mips-linux-uclibc
+++ b/meta/site/mips-linux-uclibc
@@ -63,23 +63,11 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
-# db3
+# db
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
-db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
-db_cv_uimutexes=${db_cv_uimutexes=no}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
# rrdtool
rd_cv_ieee_works=${rd_cv_ieee_works=yes}
diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux
index 76c0dc0..2805be1 100644
--- a/meta/site/mipsel-linux
+++ b/meta/site/mipsel-linux
@@ -64,23 +64,11 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
-# db3
+# db
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
-db_cv_mutex=${db_cv_mutex=no}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
-db_cv_uimutexes=${db_cv_uimutexes=no}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
# rrdtool
rd_cv_ieee_works=${rd_cv_ieee_works=yes}
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index 3a05053..6df66dc 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -93,23 +93,11 @@ sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes}
# links
ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes}
-# sleepycat db
+# db
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
-db_cv_mutex=${db_cv_mutex=no}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
-db_cv_uimutexes=${db_cv_uimutexes=no}
# php
ac_cv_pread=${ac_cv_pread=no}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index b6b0bf5..12ac3d8 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -102,23 +102,11 @@ samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
-# sleepycat db
+# db
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
-db_cv_mutex=${db_cv_mutex=no}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
-db_cv_uimutexes=${db_cv_uimutexes=no}
# php
ac_cv_pread=${ac_cv_pread=no}
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
index 076e5b6..1b83ce9 100644
--- a/meta/site/x86_64-linux
+++ b/meta/site/x86_64-linux
@@ -35,19 +35,9 @@ ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long long'}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
-db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_uimutexes=${db_cv_uimutexes=no}
+
+# glib
glib_cv_hasinline=${glib_cv_hasinline=yes}
glib_cv_has__inline=${glib_cv_has__inline=yes}
glib_cv_has__inline__=${glib_cv_has__inline__=yes}
diff --git a/meta/site/x86_64-linux-uclibc b/meta/site/x86_64-linux-uclibc
index 771e725..f646c31 100644
--- a/meta/site/x86_64-linux-uclibc
+++ b/meta/site/x86_64-linux-uclibc
@@ -27,19 +27,7 @@ ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long long'}
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
-db_cv_mutex=${db_cv_mutex=no}
-db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
-db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
-db_cv_path_cp=${db_cv_path_cp=/bin/cp}
-db_cv_path_ln=${db_cv_path_ln=/bin/ln}
-db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
-db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
-db_cv_path_rm=${db_cv_path_rm=/bin/rm}
-db_cv_path_sh=${db_cv_path_sh=/bin/sh}
-db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
-db_cv_posixmutexes=${db_cv_posixmutexes=no}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
-db_cv_uimutexes=${db_cv_uimutexes=no}
glib_cv_hasinline=${glib_cv_hasinline=yes}
glib_cv_has__inline=${glib_cv_has__inline=yes}
glib_cv_has__inline__=${glib_cv_has__inline__=yes}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 29/35] siteinfo: Move general realloc/malloc values to common-$libc
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (27 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 28/35] siteinfo: Move certain db entries " Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 30/35] siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid, grgid}) to common-libc Saul Wold
` (6 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
These are tests for glibc behavior which we have enabled in uclibc.
Note that if we ever disable MALLOC_GLIBC_COMPAT the uclibc tests
will need to be changed (but I believe this would also entail massive
patching to the rest of userspace so this should be unlikely).
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-common | 4 ----
meta/site/arm-linux | 2 --
meta/site/arm-linux-uclibc | 2 --
meta/site/armeb-linux | 2 --
meta/site/armeb-linux-uclibc | 2 --
meta/site/common-glibc | 3 +++
meta/site/common-uclibc | 4 ++++
meta/site/ix86-common | 5 -----
meta/site/mips-common | 3 ---
meta/site/mips-linux | 3 ---
meta/site/mips-linux-uclibc | 3 ---
meta/site/mipsel-linux | 3 ---
meta/site/mipsel-linux-uclibc | 3 ---
meta/site/powerpc-linux | 4 ----
meta/site/powerpc32-linux | 4 ----
meta/site/sh-common | 6 ------
meta/site/sparc-linux | 2 --
meta/site/x86_64-linux | 2 --
meta/site/x86_64-linux-uclibc | 5 -----
19 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/meta/site/arm-common b/meta/site/arm-common
index 2524db4..c216b57 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -180,10 +180,6 @@ screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes}
slrn_cv___va_copy=${slrn_cv___va_copy=yes}
slrn_cv_va_copy=${slrn_cv_va_copy=yes}
slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
-ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# socat
ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13}
diff --git a/meta/site/arm-linux b/meta/site/arm-linux
index 1211ad4..8ac9041 100644
--- a/meta/site/arm-linux
+++ b/meta/site/arm-linux
@@ -1,8 +1,6 @@
ac_cv_func_getpgrp_void=yes
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc
index 017594d..70d0908 100644
--- a/meta/site/arm-linux-uclibc
+++ b/meta/site/arm-linux-uclibc
@@ -1,8 +1,6 @@
ac_cv_func_getpgrp_void=yes
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux
index 45fa692..ecff3da 100644
--- a/meta/site/armeb-linux
+++ b/meta/site/armeb-linux
@@ -1,8 +1,6 @@
ac_cv_func_getpgrp_void=yes
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc
index 50874c4..8365810 100644
--- a/meta/site/armeb-linux-uclibc
+++ b/meta/site/armeb-linux-uclibc
@@ -1,8 +1,6 @@
ac_cv_func_getpgrp_void=yes
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
diff --git a/meta/site/common-glibc b/meta/site/common-glibc
index a34396f..9339655 100644
--- a/meta/site/common-glibc
+++ b/meta/site/common-glibc
@@ -1,5 +1,8 @@
# general
ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
+ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
+ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
ac_cv_type_uid_t={ac_cv_type_uid_t=yes}
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index ce216bb..8ea192c 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -1,5 +1,9 @@
# general
ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no}
+ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
+ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
+ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# glib
glib_cv_strlcpy=${glib_cv_strlcpy=no}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index 47f7178..ea8937e 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -25,8 +25,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
-ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
@@ -167,9 +165,6 @@ ac_cv_alignof_CORBA_struct=4
ac_cv_alignof_CORBA_wchar=2
ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
-# p3scan
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-
# php
ac_cv_pread=${ac_cv_pread=no}
ac_cv_pwrite=${ac_cv_pwrite=no}
diff --git a/meta/site/mips-common b/meta/site/mips-common
index bbfc779..e7eb3af 100644
--- a/meta/site/mips-common
+++ b/meta/site/mips-common
@@ -1,6 +1,3 @@
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
-
# cvs
cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
diff --git a/meta/site/mips-linux b/meta/site/mips-linux
index f81d4fa..a8e52ae 100644
--- a/meta/site/mips-linux
+++ b/meta/site/mips-linux
@@ -3,9 +3,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-# tslib, others
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
-
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
index f81d4fa..a8e52ae 100644
--- a/meta/site/mips-linux-uclibc
+++ b/meta/site/mips-linux-uclibc
@@ -3,9 +3,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-# tslib, others
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
-
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux
index 2805be1..fc2a9c0 100644
--- a/meta/site/mipsel-linux
+++ b/meta/site/mipsel-linux
@@ -3,9 +3,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-# tslib, others
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
-
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc
index 838bdff..c589cfd 100644
--- a/meta/site/mipsel-linux-uclibc
+++ b/meta/site/mipsel-linux-uclibc
@@ -3,9 +3,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-# tslib, others
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
-
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
diff --git a/meta/site/powerpc-linux b/meta/site/powerpc-linux
index 399a58e..93a94f5 100644
--- a/meta/site/powerpc-linux
+++ b/meta/site/powerpc-linux
@@ -7,10 +7,6 @@ ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# startup-notification
lf_cv_sane_realloc=yes
-# flex
-ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-
# glib
glib_cv_stack_grows=${glib_cv_stack_grows=no}
glib_cv_uscore=${glib_cv_uscore=no}
diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux
index 6df66dc..46b64eb 100644
--- a/meta/site/powerpc32-linux
+++ b/meta/site/powerpc32-linux
@@ -1,5 +1,3 @@
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1}
@@ -165,8 +163,6 @@ compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no}
slrn_cv___va_copy=${slrn_cv___va_copy=yes}
slrn_cv_va_copy=${slrn_cv_va_copy=no}
slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
-ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
diff --git a/meta/site/sh-common b/meta/site/sh-common
index 12ac3d8..ce7c41b 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -1,7 +1,5 @@
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
@@ -178,10 +176,6 @@ compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no}
slrn_cv___va_copy=${slrn_cv___va_copy=yes}
slrn_cv_va_copy=${slrn_cv_va_copy=no}
slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
-ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# startup-notification
lf_cv_sane_realloc=yes
diff --git a/meta/site/sparc-linux b/meta/site/sparc-linux
index f4c221c..a0ac8d1 100644
--- a/meta/site/sparc-linux
+++ b/meta/site/sparc-linux
@@ -1,8 +1,6 @@
ac_cv_func_getpgrp_void=yes
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
index 1b83ce9..48e94da 100644
--- a/meta/site/x86_64-linux
+++ b/meta/site/x86_64-linux
@@ -2,7 +2,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
@@ -100,7 +99,6 @@ ac_cv_alignof_CORBA_wchar=2
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
sudo_cv_uid_t=${sudo_cv_uid_t_len=10}
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
lf_cv_sane_realloc=yes
as_cv_unaligned_access=${as_cv_unaligned_access=yes}
diff --git a/meta/site/x86_64-linux-uclibc b/meta/site/x86_64-linux-uclibc
index f646c31..be74642 100644
--- a/meta/site/x86_64-linux-uclibc
+++ b/meta/site/x86_64-linux-uclibc
@@ -2,7 +2,6 @@ ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
-ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
@@ -68,10 +67,6 @@ am_cv_func_working_getline=${am_cv_func_working_getline=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
-# flex
-ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
-ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
-
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 30/35] siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid, grgid}) to common-libc
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (28 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 29/35] siteinfo: Move general realloc/malloc values to common-$libc Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 31/35] siteinfo: Rework the siteinfo for powerpc to fix uclibc fallout Saul Wold
` (5 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Tom Rini <tom_rini@mentor.com>
These functions are determined by the C library so move them to common-glibc
and common-uclibc
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
meta/site/arm-common | 4 ----
meta/site/arm-linux | 5 -----
meta/site/arm-linux-uclibc | 5 -----
meta/site/armeb-linux | 5 -----
meta/site/armeb-linux-uclibc | 5 -----
meta/site/common-glibc | 7 +++++++
meta/site/common-uclibc | 7 +++++++
meta/site/ix86-common | 6 ------
meta/site/mips-linux | 6 ------
meta/site/mips-linux-uclibc | 6 ------
meta/site/mipsel-linux | 6 ------
meta/site/mipsel-linux-uclibc | 4 ----
meta/site/powerpc-linux | 6 ------
meta/site/sh-common | 4 ----
meta/site/sparc-linux | 4 ----
meta/site/x86_64-linux | 6 ------
meta/site/x86_64-linux-uclibc | 5 -----
17 files changed, 14 insertions(+), 77 deletions(-)
diff --git a/meta/site/arm-common b/meta/site/arm-common
index c216b57..04d1164 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -48,9 +48,6 @@ ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
-# gio
-ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
-
# glib
glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
@@ -67,7 +64,6 @@ glib_cv_va_copy=${glib_cv_va_copy=yes}
glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
glib_cv___va_copy=${glib_cv___va_copy=yes}
glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
-ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes}
glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes}
glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes}
diff --git a/meta/site/arm-linux b/meta/site/arm-linux
index 8ac9041..412be5a 100644
--- a/meta/site/arm-linux
+++ b/meta/site/arm-linux
@@ -1,8 +1,3 @@
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc
index 70d0908..6ae7c6e 100644
--- a/meta/site/arm-linux-uclibc
+++ b/meta/site/arm-linux-uclibc
@@ -1,8 +1,3 @@
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux
index ecff3da..6521ff5 100644
--- a/meta/site/armeb-linux
+++ b/meta/site/armeb-linux
@@ -1,8 +1,3 @@
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc
index 8365810..731e857 100644
--- a/meta/site/armeb-linux-uclibc
+++ b/meta/site/armeb-linux-uclibc
@@ -1,8 +1,3 @@
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/meta/site/common-glibc b/meta/site/common-glibc
index 9339655..8cfa695 100644
--- a/meta/site/common-glibc
+++ b/meta/site/common-glibc
@@ -5,6 +5,13 @@ ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
+ac_cv_func_getpgrp_void=yes
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_setgrent_void=yes
+ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
+ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
ac_cv_type_uid_t={ac_cv_type_uid_t=yes}
# bash
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index 8ea192c..093f60e 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -4,6 +4,13 @@ ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
+ac_cv_func_getpgrp_void=yes
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_setgrent_void=yes
+ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
+ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# glib
glib_cv_strlcpy=${glib_cv_strlcpy=no}
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index ea8937e..2ead4e1 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -21,15 +21,11 @@ ac_cv_sizeof_uid_t=${ac_cv_sizeof_uid_t=4}
ac_cv_sizeof_gid_t=${ac_cv_sizeof_gid_t=4}
ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=4}
ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
-ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
@@ -106,9 +102,7 @@ glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=yes}
# glib-2.0
glib_cv_stack_grows=${glib_cv_stack_grows=no}
utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# guile
ac_cv_uchar=${ac_cv_uchar=no}
diff --git a/meta/site/mips-linux b/meta/site/mips-linux
index a8e52ae..86d396e 100644
--- a/meta/site/mips-linux
+++ b/meta/site/mips-linux
@@ -1,7 +1,4 @@
-
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
@@ -35,9 +32,7 @@ glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
# glib-2.0
glib_cv_stack_grows=${glib_cv_stack_grows=no}
utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# libpcap
ac_cv_linux_vers=${ac_cv_linux_vers=2}
@@ -55,7 +50,6 @@ lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
# ncftp
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
index a8e52ae..86d396e 100644
--- a/meta/site/mips-linux-uclibc
+++ b/meta/site/mips-linux-uclibc
@@ -1,7 +1,4 @@
-
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
@@ -35,9 +32,7 @@ glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
# glib-2.0
glib_cv_stack_grows=${glib_cv_stack_grows=no}
utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# libpcap
ac_cv_linux_vers=${ac_cv_linux_vers=2}
@@ -55,7 +50,6 @@ lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
# ncftp
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux
index fc2a9c0..4070055 100644
--- a/meta/site/mipsel-linux
+++ b/meta/site/mipsel-linux
@@ -1,7 +1,5 @@
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
@@ -35,10 +33,7 @@ glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
# glib-2.0
glib_cv_stack_grows=${glib_cv_stack_grows=no}
utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
-
# libpcap
ac_cv_linux_vers=${ac_cv_linux_vers=2}
@@ -56,7 +51,6 @@ lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
# ncftp
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc
index c589cfd..aaf47c0 100644
--- a/meta/site/mipsel-linux-uclibc
+++ b/meta/site/mipsel-linux-uclibc
@@ -1,7 +1,4 @@
-
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
@@ -48,7 +45,6 @@ lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
# ncftp
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
diff --git a/meta/site/powerpc-linux b/meta/site/powerpc-linux
index 93a94f5..74eb0a7 100644
--- a/meta/site/powerpc-linux
+++ b/meta/site/powerpc-linux
@@ -1,9 +1,3 @@
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
-
# startup-notification
lf_cv_sane_realloc=yes
diff --git a/meta/site/sh-common b/meta/site/sh-common
index ce7c41b..3fe00f0 100644
--- a/meta/site/sh-common
+++ b/meta/site/sh-common
@@ -1,6 +1,3 @@
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
@@ -127,7 +124,6 @@ glib_cv_va_copy=${glib_cv_va_copy=no}
glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
glib_cv___va_copy=${glib_cv___va_copy=yes}
glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
-ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes}
glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes}
glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes}
diff --git a/meta/site/sparc-linux b/meta/site/sparc-linux
index a0ac8d1..49d0d9a 100644
--- a/meta/site/sparc-linux
+++ b/meta/site/sparc-linux
@@ -1,7 +1,3 @@
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setgrent_void=yes
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux
index 48e94da..968dedc 100644
--- a/meta/site/x86_64-linux
+++ b/meta/site/x86_64-linux
@@ -1,10 +1,6 @@
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
-ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
@@ -96,8 +92,6 @@ ac_cv_alignof_CORBA_short=2
ac_cv_alignof_CORBA_struct=1
ac_cv_alignof_CORBA_wchar=2
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
-
sudo_cv_uid_t=${sudo_cv_uid_t_len=10}
lf_cv_sane_realloc=yes
as_cv_unaligned_access=${as_cv_unaligned_access=yes}
diff --git a/meta/site/x86_64-linux-uclibc b/meta/site/x86_64-linux-uclibc
index be74642..4699240 100644
--- a/meta/site/x86_64-linux-uclibc
+++ b/meta/site/x86_64-linux-uclibc
@@ -1,10 +1,6 @@
-ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
-ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
-ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
-ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
@@ -65,7 +61,6 @@ am_cv_func_working_getline=${am_cv_func_working_getline=yes}
# glib-2.0
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
-ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 31/35] siteinfo: Rework the siteinfo for powerpc to fix uclibc fallout
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (29 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 30/35] siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid, grgid}) to common-libc Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 32/35] Remove -live.bb recipes Saul Wold
` (4 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
I believe that powerpc-linux is now a common file across 32bit/64bit
linux for powerpc be it uclibc or glibc. I compared the differences
between powerpc-linux-uclibc and powerpc-linux files and it
powerpc-linux was more uptodate and all the new stuff it had was needed
for uclibc anyway so we do not need to keep exact copy of powerpc-linux
as powerpc-linux-uclibc instead we use powerpc-linux for powerpc/uclibc
targets.
Secondly linux specific files were added in archinfo dictionary
which I think logically belongs to targetinfo dictionary therefore
moved them to targetinfo
now uclibc/powerpc is buildable again
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/siteinfo.bbclass | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
delete mode 100644 meta/site/powerpc-linux-uclibc
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index f3c24e8..9dacd58 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -33,11 +33,11 @@ def siteinfo_data(d):
"mips64": "endian-big bit-64 mips64-common",
"mips64el": "endian-little bit-64 mips64-common",
"mipsel": "endian-little bit-32 mips-common",
- "powerpc": "endian-big bit-32 powerpc-common powerpc32-linux",
+ "powerpc": "endian-big bit-32 powerpc-common",
"nios2": "endian-little bit-32 nios2-common",
- "powerpc64": "endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux",
- "ppc": "endian-big bit-32 powerpc-common powerpc32-linux",
- "ppc64": "endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux",
+ "powerpc64": "endian-big bit-64 powerpc-common",
+ "ppc": "endian-big bit-32 powerpc-common",
+ "ppc64": "endian-big bit-64 powerpc-common",
"sh3": "endian-little bit-32 sh-common",
"sh4": "endian-little bit-32 sh-common",
"sparc": "endian-big bit-32",
@@ -62,8 +62,12 @@ def siteinfo_data(d):
"arm-linux-uclibceabi": "arm-linux-uclibc",
"armeb-linux-gnueabi": "armeb-linux",
"armeb-linux-uclibceabi": "armeb-linux-uclibc",
- "powerpc-linux-gnuspe": "powerpc-linux",
- "powerpc-linux-uclibcspe": "powerpc-linux-uclibc",
+ "powerpc-linux": "powerpc32-linux",
+ "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux",
+ "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux",
+ "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc",
+ "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux",
+ "powerpc64-linux": "powerpc-linux",
}
hostarch = d.getVar("HOST_ARCH", True)
diff --git a/meta/site/powerpc-linux-uclibc b/meta/site/powerpc-linux-uclibc
deleted file mode 100644
index e69de29..0000000
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 32/35] Remove -live.bb recipes
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (30 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 31/35] siteinfo: Rework the siteinfo for powerpc to fix uclibc fallout Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 33/35] Remove -directdisk.bb recipes Saul Wold
` (3 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta-rt/images/core-image-minimal-rt-live.bb | 15 --------------
meta/recipes-core/images/core-image-live.inc | 21 --------------------
.../recipes-core/images/core-image-minimal-live.bb | 11 ----------
.../recipes-extended/images/core-image-lsb-live.bb | 11 ----------
.../images/core-image-lsb-sdk-live.bb | 11 ----------
meta/recipes-sato/images/core-image-sato-live.bb | 11 ----------
.../images/core-image-sato-sdk-live.bb | 11 ----------
7 files changed, 0 insertions(+), 91 deletions(-)
delete mode 100644 meta-rt/images/core-image-minimal-rt-live.bb
delete mode 100644 meta/recipes-core/images/core-image-live.inc
delete mode 100644 meta/recipes-core/images/core-image-minimal-live.bb
delete mode 100644 meta/recipes-extended/images/core-image-lsb-live.bb
delete mode 100644 meta/recipes-extended/images/core-image-lsb-sdk-live.bb
delete mode 100644 meta/recipes-sato/images/core-image-sato-live.bb
delete mode 100644 meta/recipes-sato/images/core-image-sato-sdk-live.bb
diff --git a/meta-rt/images/core-image-minimal-rt-live.bb b/meta-rt/images/core-image-minimal-rt-live.bb
deleted file mode 100644
index 9e0fdba..0000000
--- a/meta-rt/images/core-image-minimal-rt-live.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2010 Intel Corporation.
-#
-
-DESCRIPTION = "Bootable Live Minimal Real-Time Linux Image"
-
-require recipes-core/images/core-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-rt-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "core-image-minimal-rt:do_rootfs"
diff --git a/meta/recipes-core/images/core-image-live.inc b/meta/recipes-core/images/core-image-live.inc
deleted file mode 100644
index 2c9b3fb..0000000
--- a/meta/recipes-core/images/core-image-live.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-AUTO_SYSLINUXCFG = "1"
-INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
-APPEND += "root=/dev/ram0 "
-TIMEOUT = "10"
-
-EXCLUDE_FROM_WORLD = "1"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
-
-inherit bootimg
-
-do_bootimg_prepend () {
- import bb
- fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
- if 'ext3' not in fstypes:
- bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
diff --git a/meta/recipes-core/images/core-image-minimal-live.bb b/meta/recipes-core/images/core-image-minimal-live.bb
deleted file mode 100644
index 0ce2afb..0000000
--- a/meta/recipes-core/images/core-image-minimal-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Minimal Bootable Live Image"
-
-require core-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "core-image-minimal:do_rootfs"
diff --git a/meta/recipes-extended/images/core-image-lsb-live.bb b/meta/recipes-extended/images/core-image-lsb-live.bb
deleted file mode 100644
index 72f10f7..0000000
--- a/meta/recipes-extended/images/core-image-lsb-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "LSB Bootable Live Image"
-
-require recipes-core/images/core-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "core-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk-live.bb b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
deleted file mode 100644
index b01ae06..0000000
--- a/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "LSB SDK Bootable Live Image"
-
-require recipes-core/images/core-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-sdk-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "core-image-lsb-sdk:do_rootfs"
diff --git a/meta/recipes-sato/images/core-image-sato-live.bb b/meta/recipes-sato/images/core-image-sato-live.bb
deleted file mode 100644
index 9511ca6..0000000
--- a/meta/recipes-sato/images/core-image-sato-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Sato Bootable Live Image"
-
-require recipes-core/images/core-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "core-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-live.bb b/meta/recipes-sato/images/core-image-sato-sdk-live.bb
deleted file mode 100644
index f11d895..0000000
--- a/meta/recipes-sato/images/core-image-sato-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Bootable Live Sato SDK Image"
-
-require recipes-core/images/core-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "core-image-sato-sdk:do_rootfs"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 33/35] Remove -directdisk.bb recipes
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (31 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 32/35] Remove -live.bb recipes Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 7:47 ` [Consolidated & Tested 34/35] classes/image*: Revamp creation of live images Saul Wold
` (2 subsequent siblings)
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta-rt/images/core-image-minimal-rt-directdisk.bb | 15 ---------------
meta/recipes-core/images/core-image-directdisk.inc | 11 -----------
.../images/core-image-minimal-directdisk.bb | 11 -----------
.../images/core-image-sato-directdisk.bb | 9 ---------
.../images/core-image-sato-sdk-directdisk.bb | 9 ---------
5 files changed, 0 insertions(+), 55 deletions(-)
delete mode 100644 meta-rt/images/core-image-minimal-rt-directdisk.bb
delete mode 100644 meta/recipes-core/images/core-image-directdisk.inc
delete mode 100644 meta/recipes-core/images/core-image-minimal-directdisk.bb
delete mode 100644 meta/recipes-sato/images/core-image-sato-directdisk.bb
delete mode 100644 meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb
diff --git a/meta-rt/images/core-image-minimal-rt-directdisk.bb b/meta-rt/images/core-image-minimal-rt-directdisk.bb
deleted file mode 100644
index b3f3523..0000000
--- a/meta-rt/images/core-image-minimal-rt-directdisk.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2010 Intel Corporation.
-#
-
-require recipes-core/images/core-image-directdisk.inc
-
-DESCRIPTION = "Bootable Minimal Real-Time Direct Disk Image"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-rt-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootdirectdisk[depends] += "core-image-minimal-rt:do_rootfs"
-
-
diff --git a/meta/recipes-core/images/core-image-directdisk.inc b/meta/recipes-core/images/core-image-directdisk.inc
deleted file mode 100644
index ef9e72d..0000000
--- a/meta/recipes-core/images/core-image-directdisk.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-inherit boot-directdisk
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-do_bootdirectdisk_prepend () {
- import bb
- fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
- if 'ext3' not in fstypes:
- bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
\ No newline at end of file
diff --git a/meta/recipes-core/images/core-image-minimal-directdisk.bb b/meta/recipes-core/images/core-image-minimal-directdisk.bb
deleted file mode 100644
index ed23e45..0000000
--- a/meta/recipes-core/images/core-image-minimal-directdisk.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require core-image-directdisk.inc
-
-DESCRIPTION = "Minimal Bootable Direct Disk Image"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootdirectdisk[depends] += "core-image-minimal:do_rootfs"
-
-
diff --git a/meta/recipes-sato/images/core-image-sato-directdisk.bb b/meta/recipes-sato/images/core-image-sato-directdisk.bb
deleted file mode 100644
index 1e6aa66..0000000
--- a/meta/recipes-sato/images/core-image-sato-directdisk.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require recipes-core/images/core-image-directdisk.inc
-
-DESCRIPTION = "Sato Direct Disk Image"
-
-LICENSE = "MIT"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3"
-
-do_bootdirectdisk[depends] += "core-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb b/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb
deleted file mode 100644
index 4c1535a..0000000
--- a/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require recipes-core/images/core-image-directdisk.inc
-
-DESCRIPTION = "Sato SDK Direct Disk Image"
-
-LICENSE = "MIT"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3"
-
-do_bootdirectdisk[depends] += "core-image-sato-sdk:do_rootfs"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* [Consolidated & Tested 34/35] classes/image*: Revamp creation of live images
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (32 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 33/35] Remove -directdisk.bb recipes Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 11:03 ` Richard Purdie
2011-07-27 7:47 ` [Consolidated & Tested 35/35] utils.bbclass: Don't forget to pass the cmdline options Saul Wold
2011-07-27 11:06 ` [Consolidated & Tested 00/35] July 27 Richard Purdie
35 siblings, 1 reply; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
This creates a live image as an IMAGE_FSTYPES, thus removing the
need to have additional -live.bb recipes. To create a live image
one just needs to add live to the IMAGE_FSTYPES list
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image-live.bbclass | 13 +++++++++++++
meta/classes/image.bbclass | 3 +++
meta/classes/image_types.bbclass | 15 +++++++++++++--
3 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 meta/classes/image-empty.bbclass
create mode 100644 meta/classes/image-live.bbclass
diff --git a/meta/classes/image-empty.bbclass b/meta/classes/image-empty.bbclass
new file mode 100644
index 0000000..e69de29
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
new file mode 100644
index 0000000..2568d5c
--- /dev/null
+++ b/meta/classes/image-live.bbclass
@@ -0,0 +1,13 @@
+
+AUTO_SYSLINUXCFG = "1"
+INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
+APPEND += "root=/dev/ram0 "
+TIMEOUT = "10"
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+
+do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
+do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"
+
+inherit image-live
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index edfb2d6..79a56f0 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -29,6 +29,9 @@ LDCONFIGDEPEND_libc-uclibc = ""
do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
+IMAGE_TYPE = ${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}
+inherit image-${IMAGE_TYPE}
+
python () {
deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index f1aef86..cd901c1 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -1,7 +1,18 @@
+
def get_imagecmds(d):
cmds = "\n"
old_overrides = bb.data.getVar('OVERRIDES', d, 0)
- for type in bb.data.getVar('IMAGE_FSTYPES', d, True).split():
+
+ types = bb.data.getVar('IMAGE_FSTYPES', d, True).split()
+ # Live images will be processed via inheriting bbclass and
+ # does not get processed here.
+ # live images also depend on ext3 so ensure its present
+ if "live" in types:
+ if "ext3" not in types:
+ types.append("ext3")
+ types.remove("live")
+
+ for type in types:
localdata = bb.data.createCopy(d)
localdata.setVar('OVERRIDES', '%s:%s' % (type, old_overrides))
bb.data.update_data(localdata)
@@ -103,4 +114,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
IMAGE_DEPENDS_ubifs = "mtd-utils-native"
# This variable is available to request which values are suitable for IMAGE_FSTYPES
-IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
+IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 34/35] classes/image*: Revamp creation of live images
2011-07-27 7:47 ` [Consolidated & Tested 34/35] classes/image*: Revamp creation of live images Saul Wold
@ 2011-07-27 11:03 ` Richard Purdie
0 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-07-27 11:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-27 at 00:47 -0700, Saul Wold wrote:
> This creates a live image as an IMAGE_FSTYPES, thus removing the
> need to have additional -live.bb recipes. To create a live image
> one just needs to add live to the IMAGE_FSTYPES list
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/classes/image-live.bbclass | 13 +++++++++++++
> meta/classes/image.bbclass | 3 +++
> meta/classes/image_types.bbclass | 15 +++++++++++++--
> 3 files changed, 29 insertions(+), 2 deletions(-)
> create mode 100644 meta/classes/image-empty.bbclass
> create mode 100644 meta/classes/image-live.bbclass
>
> diff --git a/meta/classes/image-empty.bbclass b/meta/classes/image-empty.bbclass
> new file mode 100644
> index 0000000..e69de29
> diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
> new file mode 100644
> index 0000000..2568d5c
> --- /dev/null
> +++ b/meta/classes/image-live.bbclass
> @@ -0,0 +1,13 @@
> +
> +AUTO_SYSLINUXCFG = "1"
> +INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
> +APPEND += "root=/dev/ram0 "
> +TIMEOUT = "10"
> +LABELS += "boot install"
> +
> +ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
> +
> +do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
> +do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"
> +
> +inherit image-live
You mean bootimg here but I fixed up the patch ;-)
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* [Consolidated & Tested 35/35] utils.bbclass: Don't forget to pass the cmdline options
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (33 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 34/35] classes/image*: Revamp creation of live images Saul Wold
@ 2011-07-27 7:47 ` Saul Wold
2011-07-27 11:06 ` [Consolidated & Tested 00/35] July 27 Richard Purdie
35 siblings, 0 replies; 51+ messages in thread
From: Saul Wold @ 2011-07-27 7:47 UTC (permalink / raw)
To: openembedded-core
This ensure that the command line options from the creation of the wrapper
are actaully passed into the wrapper.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/utils.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 9930a24..8c3a9b8 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -290,7 +290,7 @@ create_cmdline_wrapper () {
cat <<END >$cmd
#!/bin/sh
realpath=\`readlink -fn \$0\`
-exec \`dirname \$realpath\`/$cmdname "\$@"
+exec \`dirname \$realpath\`/$cmdname $@ "\$@"
END
chmod +x $cmd
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 51+ messages in thread* Re: [Consolidated & Tested 00/35] July 27
2011-07-27 7:46 [Consolidated & Tested 00/35] July 27 Saul Wold
` (34 preceding siblings ...)
2011-07-27 7:47 ` [Consolidated & Tested 35/35] utils.bbclass: Don't forget to pass the cmdline options Saul Wold
@ 2011-07-27 11:06 ` Richard Purdie
35 siblings, 0 replies; 51+ messages in thread
From: Richard Purdie @ 2011-07-27 11:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Saul,
On Wed, 2011-07-27 at 00:46 -0700, Saul Wold wrote:
> The following changes since commit 02031d766f983cd7e01e468cb2c926604313cd2a:
>
> arch-ia32.inc: Fix up TUNE_ARCH variable conflicts (2011-07-26 22:39:49 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/live
I merged the following:
> Bruce Ashfield (1):
> machine/qemu: set preferred linux-yocto kernel version
>
> Enrico Scholz (2):
> console-tools: removed wildcard from SRC_URI
> module-init-tools: do not build static utilities for -cross
[I've made a note on this one to remove the static patch from that
recipe]
> Kang Kai (5):
> libpam: update to 1.1.4 and add subpackage xtests
> cups: add pam support
> screen: add pam support
> sudo: add pam support
> shadow: update pam related configure files
>
> Khem Raj (2):
> libxcb: Add missing DEPENDS on libxdmcp
> siteinfo: Rework the siteinfo for powerpc to fix uclibc fallout
>
> Koen Kooi (1):
> dropbear: don't override DISTRO_TYPE if it is already set
>
> Paul Eggleton (6):
> meta/conf/local.conf.sample: remove oprofileui-native related
> settings
> meta/conf/local.conf.sample: improve comments/layout
[merged with fixes to remove the patch conflict it contained]
> meta/conf/local.conf.sample: improve terminal examples/comments
> eglibc: remove unnecessary FILESPATHPKG usage
> scripts/combo-layer: keep carriage returns at the end of lines
>
> Saul Wold (5):
> libcap: Update to 2.22 with License Clarification
> Remove -live.bb recipes
> Remove -directdisk.bb recipes
> classes/image*: Revamp creation of live images
[fixed to inherit the right class]
> utils.bbclass: Don't forget to pass the cmdline options
>
> Tom Rini (8):
> siteinfo: Move certain samba entries to common-linux
> siteinfo: Move certain bash entries to common-linux
> x86_64-linux siteinfo: Add bash info
> siteinfo: Move certain mysql entries to common-linux
> siteinfo: Move certain db entries to common-linux
> siteinfo: Move general realloc/malloc values to common-$libc
> siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid,grgid}) to
> common-libc
>
> Wenzong Fan (2):
> cronie: enable PAM support for cronie
> at: enable pam support
>
> Xiaofeng Yan (3):
> openssh: Support PAM
> dropbear: Support pam
> polkit: Support pam
I discussed this one with Paul and we've agreed to patch bitbake so I
didn't take it:
meta/conf/local.conf.sample: remove nonfunctional BBINCLUDELOGS
setting
I dropped this as per discussion and comments from Phil:
siteinfo: Move the rp-pppoe entry to common-linux
Cheers,
Richard
^ permalink raw reply [flat|nested] 51+ messages in thread