* [PATCH 01/10] libpcre: fix the name collision with libc
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme Saul Wold
` (10 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Qing He <qing.he@intel.com>
fixes [YOCTO #721] [YOCTO #722]
[sgw: added patch comment, bump PR, and changed BUGID -> YOCTO]
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../libpcre/files/fix-pcre-name-collision.patch | 40 ++++++++++++++++++++
meta/recipes-support/libpcre/libpcre_8.10.bb | 5 +-
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch
diff --git a/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch b/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch
new file mode 100644
index 0000000..6548353
--- /dev/null
+++ b/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch
@@ -0,0 +1,40 @@
+
+This patch address a namespace collision with libc.
+
+Although there is no "#include <regex.h>" in the source file, at
+runtime, it's unintentionally linked to the libc version, the regcomp of
+libc is called instead the pcre one using pcre's data structure...
+that looks like a disaster.
+
+Can patch is from Debian (and Ubuntu 11.04alpha has it also).
+
+[sgw: added patch comment]
+Signed-off-by: Qing He <qing.he@intel.com>
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+--- a/pcreposix.h 2010-05-17 00:17:23.000000000 +0800
++++ b/pcreposix.h 2009-01-15 04:32:17.000000000 +0800
+@@ -133,14 +130,19 @@
+
+ /* The functions */
+
+-PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
+-PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
++PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int);
++PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t,
+ regmatch_t *, int);
+-PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
+-PCREPOSIX_EXP_DECL void regfree(regex_t *);
++PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t);
++PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *);
+
+ #ifdef __cplusplus
+ } /* extern "C" */
+ #endif
+
++#define regcomp pcreposix_regcomp
++#define regexec pcreposix_regexec
++#define regerror pcreposix_regerror
++#define regfree pcreposix_regfree
++
+ #endif /* End of pcreposix.h */
diff --git a/meta/recipes-support/libpcre/libpcre_8.10.bb b/meta/recipes-support/libpcre/libpcre_8.10.bb
index db89c89..2e17493 100644
--- a/meta/recipes-support/libpcre/libpcre_8.10.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.10.bb
@@ -5,11 +5,12 @@ provides a POSIX calling interface to PCRE; the regular expressions \
themselves still follow Perl syntax and semantics. The header file for \
the POSIX-style functions is called pcreposix.h."
SECTION = "devel"
-PR = "r4"
+PR = "r6"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=77f9b14fe707d0376d89bc162e6c54ff"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
- file://pcre-cross.patch;patch=1"
+ file://pcre-cross.patch;patch=1 \
+ file://fix-pcre-name-collision.patch"
SRC_URI[md5sum] = "780867a700e9d4e4b9cb47aa5453e4b2"
SRC_URI[sha256sum] = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
2011-03-03 22:49 ` [PATCH 01/10] libpcre: fix the name collision with libc Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 23:24 ` [OE-core] " Richard Purdie
2011-03-03 22:49 ` [PATCH 02/10] x11vnc: Fix the start failure Saul Wold
` (9 subsequent siblings)
11 siblings, 1 reply; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
There is a tricky race condition that "Sato" icons got missing on
matchbox-desktop as low priority "hicolor" theme was chosen. Explictly
settting "Sato" in gtk config file to avoid this.
[BUGID #456] got fixed.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../sato-icon-theme/sato-icon-theme.inc | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index a1669c6..0eff9dd 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"
EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
+#explictly setting "Sato" as default icon theme to avoid icon missing due to
+#tricky race condition
pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then
exit 1
fi
gtk-update-icon-cache -q /usr/share/icons/Sato
+ echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
}
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
2011-03-03 22:49 ` [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme Saul Wold
@ 2011-03-03 23:24 ` Richard Purdie
0 siblings, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2011-03-03 23:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: poky, Zhai Edwin
On Thu, 2011-03-03 at 14:49 -0800, Saul Wold wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
>
> There is a tricky race condition that "Sato" icons got missing on
> matchbox-desktop as low priority "hicolor" theme was chosen. Explictly
> settting "Sato" in gtk config file to avoid this.
>
> [BUGID #456] got fixed.
>
> Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
> ---
> .../sato-icon-theme/sato-icon-theme.inc | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> index a1669c6..0eff9dd 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> @@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"
>
> EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
>
> +#explictly setting "Sato" as default icon theme to avoid icon missing due to
> +#tricky race condition
> pkg_postinst_${PN} () {
> if [ "x$D" != "x" ]; then
> exit 1
> fi
> gtk-update-icon-cache -q /usr/share/icons/Sato
> + echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
> }
I've deliberately merged the previous version of this patch as this one
wipes out any contents of the file! I can live with duplicate lines for
now.
I'd like the bug to remain open on this one as this is a workaround, not
a proper fix for the problem. It can change priority/target milestone
though.
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OE-core] [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
@ 2011-03-03 23:24 ` Richard Purdie
0 siblings, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2011-03-03 23:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: poky
On Thu, 2011-03-03 at 14:49 -0800, Saul Wold wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
>
> There is a tricky race condition that "Sato" icons got missing on
> matchbox-desktop as low priority "hicolor" theme was chosen. Explictly
> settting "Sato" in gtk config file to avoid this.
>
> [BUGID #456] got fixed.
>
> Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
> ---
> .../sato-icon-theme/sato-icon-theme.inc | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> index a1669c6..0eff9dd 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> @@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"
>
> EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
>
> +#explictly setting "Sato" as default icon theme to avoid icon missing due to
> +#tricky race condition
> pkg_postinst_${PN} () {
> if [ "x$D" != "x" ]; then
> exit 1
> fi
> gtk-update-icon-cache -q /usr/share/icons/Sato
> + echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
> }
I've deliberately merged the previous version of this patch as this one
wipes out any contents of the file! I can live with duplicate lines for
now.
I'd like the bug to remain open on this one as this is a workaround, not
a proper fix for the problem. It can change priority/target milestone
though.
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
2011-03-03 23:24 ` [OE-core] " Richard Purdie
@ 2011-03-04 1:05 ` Zhai, Edwin
-1 siblings, 0 replies; 19+ messages in thread
From: Zhai, Edwin @ 2011-03-04 1:05 UTC (permalink / raw)
To: Richard Purdie; +Cc: poky, Patches and discussions about the oe-core layer
Richard Purdie wrote:
>
>
> > --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > @@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"
> >
> > EXTRA_OECONF +=
> "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
> >
> > +#explictly setting "Sato" as default icon theme to avoid icon
> missing due to
> > +#tricky race condition
> > pkg_postinst_${PN} () {
> > if [ "x$D" != "x" ]; then
> > exit 1
> > fi
> > gtk-update-icon-cache -q /usr/share/icons/Sato
> > + echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
> > }
>
> I've deliberately merged the previous version of this patch as this one
> wipes out any contents of the file! I can live with duplicate lines for
> now.
>
> I'd like the bug to remain open on this one as this is a workaround, not
> a proper fix for the problem. It can change priority/target milestone
> though.
>
Agree. We can revisit it in future. It is very hard for reproducing and
debugging.
>
> Cheers,
>
> Richard
>
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OE-core] [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
@ 2011-03-04 1:05 ` Zhai, Edwin
0 siblings, 0 replies; 19+ messages in thread
From: Zhai, Edwin @ 2011-03-04 1:05 UTC (permalink / raw)
To: Richard Purdie; +Cc: poky, Patches and discussions about the oe-core layer
Richard Purdie wrote:
>
>
> > --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > @@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"
> >
> > EXTRA_OECONF +=
> "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
> >
> > +#explictly setting "Sato" as default icon theme to avoid icon
> missing due to
> > +#tricky race condition
> > pkg_postinst_${PN} () {
> > if [ "x$D" != "x" ]; then
> > exit 1
> > fi
> > gtk-update-icon-cache -q /usr/share/icons/Sato
> > + echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
> > }
>
> I've deliberately merged the previous version of this patch as this one
> wipes out any contents of the file! I can live with duplicate lines for
> now.
>
> I'd like the bug to remain open on this one as this is a workaround, not
> a proper fix for the problem. It can change priority/target milestone
> though.
>
Agree. We can revisit it in future. It is very hard for reproducing and
debugging.
>
> Cheers,
>
> Richard
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 02/10] x11vnc: Fix the start failure
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
2011-03-03 22:49 ` [PATCH 01/10] libpcre: fix the name collision with libc Saul Wold
2011-03-03 22:49 ` [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 04/10] gstreamer: install the sound card driver of es1370 Saul Wold
` (8 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Default parameter "-gui" and "-rfbport" make x11vnc failed to start if no
"wish" installed.
[BUGID #781] got fixed.
[sgw: removed patch=1, as it's unneeded]
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../x11vnc/files/starting-fix.patch | 18 ++++++++++++++++++
meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb | 3 ++-
2 files changed, 20 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch
diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
new file mode 100644
index 0000000..f59e801
--- /dev/null
+++ b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
@@ -0,0 +1,18 @@
+"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
+Removing these 2 parameters makes x11vnc works well on poky sato image.
+
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
+===================================================================
+--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800
++++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=X11VNC Server
+ Comment=Share this desktop by VNC
+-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
++Exec=x11vnc -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
+ Icon=computer
+ Terminal=false
+ Type=Application
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
index 87cda2c..f5a6662 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
+ file://starting-fix.patch"
SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 04/10] gstreamer: install the sound card driver of es1370
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (2 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 02/10] x11vnc: Fix the start failure Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 05/10] Add libtool-nativesdk for ADT Saul Wold
` (7 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
When append "audio" to poky-qemu, emulated sound card like es1370 is
exported to guest. This patch install the kernel driver in the
poky-image-qemux86/x86_64 to use them.
[BUGID #751]
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../gstreamer/gstreamer_0.10.31.bb | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
index f489e83..96c45eb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
@@ -27,6 +27,9 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=
# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
#}
+RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+
FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 05/10] Add libtool-nativesdk for ADT
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (3 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 04/10] gstreamer: install the sound card driver of es1370 Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 06/10] ADT: Bug fix for Suse Linux Saul Wold
` (6 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Liping Ke <liping.ke@intel.com>
We need to add libtool native sdk support in ADT installer.
This patch fix #bug 791
Signed-off-by: Liping Ke <liping.ke@intel.com>
---
.../adt-installer/scripts/adt_installer_internal | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 9653284..b5e304d 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -101,6 +101,9 @@ check_result
echo_info "Installing pkgconfig nativesdk ...\n"
$OPKG_INSTALL_NATIVE_CMD pkgconfig-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
check_result
+echo_info "Installing libtool nativesdk ...\n"
+$OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
+check_result
for native_target_type in $YOCTOADT_TARGETS; do
native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/x86$/i586/'`
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 06/10] ADT: Bug fix for Suse Linux
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (4 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 05/10] Add libtool-nativesdk for ADT Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 07/10] recipe: add chkconfig for LSB command test Saul Wold
` (5 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Liping Ke <liping.ke@intel.com>
On Suse linux11.2, we found when using sudo, we must add -E opts
to preserver some network proxy environment settings. Otherwise,
opkg-cl can't access files behind firewall. [bug #785]
Also, we need to add absolute path when sourcing files.
Fix for [bug #786]
[sgw: changed eval echo $PWD -> pwd]
Signed-off-by: Liping Ke <liping.ke@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../installer/adt-installer/adt_installer | 2 +-
.../adt-installer/scripts/adt_installer_internal | 2 +-
.../installer/adt-installer/scripts/data_define | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index cca576f..2448d2b 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -152,7 +152,7 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then
rm -rf $LOCAL_OPKG_LOC
fi
- parent_folder=`eval echo $PWD`
+ parent_folder=`pwd`
cd $LOCAL_OPKG_FOLDER
check_result
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index b5e304d..df142ff 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -81,7 +81,7 @@ else
fi
#first update repository
-OPKG_CMD="sudo $LOCAL_OPKG_LOC/bin/opkg-cl"
+OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg-cl"
echo_info "Updating opkg..."
$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR update &>> $YOCTOADT_INSTALL_LOG_FILE
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index 77f8b38..c7bce6d 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -23,7 +23,7 @@
# THE SOFTWARE.
config_file="adt_installer.conf"
-source $config_file
+source `pwd`/$config_file
LOCAL_OPKG_LOC="./opkg/build/opkg"
LOCAL_OPKG_FOLDER="./opkg/build"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 07/10] recipe: add chkconfig for LSB command test
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (5 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 06/10] ADT: Bug fix for Suse Linux Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 08/10] recipe: add newt from OE Saul Wold
` (4 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Kang Kai <kai.kang@windriver.com>
chkconfig is a system tool for maintaining the /etc/rc*.d hierarchy,
and LSB command test will check 2 links point to command chkconfig
[sgw: removed commented out lines]
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-extended/chkconfig/chkconfig_1.3.49.bb | 25 ++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
new file mode 100644
index 0000000..97da4a4
--- /dev/null
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
@@ -0,0 +1,25 @@
+SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy"
+
+DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \
+information for system services. Chkconfig manipulates the numerous \
+symbolic links in /etc/rc.d, to relieve system administrators of some \
+of the drudgery of manually editing the symbolic links."
+
+HOMEPAGE = "http://fedorahosted.org/releases/c/h/chkconfig"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
+
+DEPENDS = "libnewt gettext popt"
+
+PR = "r0"
+
+SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${P}.tar.bz2"
+SRC_URI[md5sum] = "9b5e91d25f4f3b21f4c0bdf55a721431"
+SRC_URI[sha256sum] = "775100a9d6f70fbd8f33ed24b560b6842161fc496c21b1fc6d2aed646f9d855f"
+
+inherit autotools
+
+do_install_append() {
+ mkdir -p ${D}/etc/chkconfig.d
+}
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 08/10] recipe: add newt from OE
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (6 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 07/10] recipe: add chkconfig for LSB command test Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 09/10] recipe: add slang " Saul Wold
` (3 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Kang Kai <kai.kang@windriver.com>
newt is a library for text mode user interfaces, and required by
chkconfig because of LSB command test.
* This recipe is from OE commit: 71a1e1a6e6b89d4ced9c9ab537614e1e521389b0
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../newt/files/include-without-python.patch | 71 ++++++++++++++++++++
meta/recipes-extended/newt/libnewt_0.52.12.bb | 37 ++++++++++
2 files changed, 108 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/newt/files/include-without-python.patch
create mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bb
diff --git a/meta/recipes-extended/newt/files/include-without-python.patch b/meta/recipes-extended/newt/files/include-without-python.patch
new file mode 100644
index 0000000..277ee33
--- /dev/null
+++ b/meta/recipes-extended/newt/files/include-without-python.patch
@@ -0,0 +1,71 @@
+From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Thu, 20 Jan 2011 14:14:51 -0200
+Subject: [PATCH] build: add -without-python
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ Makefile.in | 8 ++++----
+ configure.ac | 10 ++++++++--
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e764e61..74e9097 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -77,7 +77,7 @@ showkey: showkey.o $(LIBNEWT)
+ $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
+
+ _snackmodule.so: snackmodule.c $(LIBNEWTSH)
+- for ver in $(PYTHONVERS) ; do \
++ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+ mkdir -p $$ver ;\
+ PCFLAGS=`$$ver-config --cflags`; \
+ PIFLAGS=`$$ver-config --includes`; \
+@@ -85,7 +85,7 @@ _snackmodule.so: snackmodule.c $(LIBNEWTSH)
+ PLFLAGS=`$$ver-config --libs`; \
+ $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
+ $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\
+- done
++ done || :
+ touch $@
+
+ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
+@@ -141,11 +141,11 @@ install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
+ ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
+ ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+ [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
+- for ver in $(PYTHONVERS) ; do \
++ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+ [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
+ install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
+ install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
+- done
++ done || :
+
+ Makefile: newt.spec
+ echo "You need to rerun ./configure before continuing"
+diff --git a/configure.ac b/configure.ac
+index 7bc381a..dc04352 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,8 +54,14 @@ fi
+ AC_CHECK_HEADERS([popt.h libintl.h])
+
+ AC_MSG_CHECKING([for python versions])
+-PYTHONVERS=$(echo /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
+-AC_MSG_RESULT([$PYTHONVERS])
++AC_ARG_WITH([python], [ --without-python do not compile python support])
++if test "x$with_python" = "xno"; then
++ AC_MSG_RESULT([skipped])
++ PYTHONVERS=
++else
++ PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
++ AC_MSG_RESULT([$PYTHONVERS])
++fi
+ AC_SUBST([PYTHONVERS])
+
+ AC_ARG_WITH([tcl], [ --without-tcl do not compile whiptcl.so])
+--
+1.7.2.3
+
diff --git a/meta/recipes-extended/newt/libnewt_0.52.12.bb b/meta/recipes-extended/newt/libnewt_0.52.12.bb
new file mode 100644
index 0000000..eefd6bd
--- /dev/null
+++ b/meta/recipes-extended/newt/libnewt_0.52.12.bb
@@ -0,0 +1,37 @@
+SUMMARY = "A library for text mode user interfaces"
+
+DESCRIPTION = "Newt is a programming library for color text mode, widget based user \
+interfaces. Newt can be used to add stacked windows, entry widgets, \
+checkboxes, radio buttons, labels, plain text fields, scrollbars, \
+etc., to text mode user interfaces. This package also contains the \
+shared library needed by programs built with newt, as well as a \
+/usr/bin/dialog replacement called whiptail. Newt is based on the \
+slang library."
+
+HOMEPAGE = "https://fedorahosted.org/newt/"
+SECTION = "libs"
+
+LICENSE = "LGPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+# slang needs to be >= 2.2
+DEPENDS = "slang popt"
+
+PR = "r0"
+
+SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38"
+SRC_URI = "git://git.fedorahosted.org/git/newt;protocol=git \
+ file://include-without-python.patch"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "--without-python --without-tcl"
+
+inherit autotools
+
+PACKAGES_prepend = "whiptail "
+
+do_configure_prepend() {
+ sh autogen.sh
+}
+
+FILES_whiptail = "${bindir}/whiptail"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 09/10] recipe: add slang from OE
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (7 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 08/10] recipe: add newt from OE Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 22:49 ` [PATCH 10/10] task-poky-lsb: add chkconfig Saul Wold
` (2 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Kang Kai <kai.kang@windriver.com>
slang is the shared library for the S-Lang extension language,
and required by newt because of LSB command check
* this recipe is from OE Commit 92c386850d735ab032a59df62d5a5f132ac58ffb
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/slang/slang/fix-uclibc.patch | 11 ++++++++
meta/recipes-extended/slang/slang_2.2.2.bb | 25 ++++++++++++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/slang/slang/fix-uclibc.patch
create mode 100644 meta/recipes-extended/slang/slang_2.2.2.bb
diff --git a/meta/recipes-extended/slang/slang/fix-uclibc.patch b/meta/recipes-extended/slang/slang/fix-uclibc.patch
new file mode 100644
index 0000000..c2b8225
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/fix-uclibc.patch
@@ -0,0 +1,11 @@
+--- slang-2.1.3.orig/src/slcommon.c 2007-01-10 18:09:07.000000000 +0200
++++ slang-2.1.3.orig/src/slcommon.c 2008-03-19 16:09:09.000000000 +0200
+@@ -191,7 +191,7 @@
+ return p;
+ }
+
+-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__)
+ extern int __libc_enable_secure;
+ # define HAVE___LIBC_ENABLE_SECURE 1
+ #endif
diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb b/meta/recipes-extended/slang/slang_2.2.2.bb
new file mode 100644
index 0000000..7fe76af
--- /dev/null
+++ b/meta/recipes-extended/slang/slang_2.2.2.bb
@@ -0,0 +1,25 @@
+SUMMARY = "The shared library for the S-Lang extension language"
+
+DESCRIPTION = "S-Lang is an interpreted language and a programming library. The \
+S-Lang language was designed so that it can be easily embedded into \
+a program to provide the program with a powerful extension language. \
+The S-Lang library, provided in this package, provides the S-Lang \
+extension language. S-Lang's syntax resembles C, which makes it easy \
+to recode S-Lang procedures in C if you need to."
+
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "pcre"
+PR = "r0"
+
+LICENSE = "GPL Artistic"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+
+SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/OLD/slang-${PV}.tar.bz2 \
+ file://fix-uclibc.patch"
+
+inherit autotools
+
+SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03"
+SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 10/10] task-poky-lsb: add chkconfig
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
` (8 preceding siblings ...)
2011-03-03 22:49 ` [PATCH 09/10] recipe: add slang " Saul Wold
@ 2011-03-03 22:49 ` Saul Wold
2011-03-03 23:27 ` [OE-core] " Richard Purdie
2011-03-03 23:41 ` [OE-core] " Richard Purdie
11 siblings, 0 replies; 19+ messages in thread
From: Saul Wold @ 2011-03-03 22:49 UTC (permalink / raw)
To: poky, openembedded-core
From: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/tasks/task-poky-lsb.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb
index ab640bd..a78e5ae 100644
--- a/meta/recipes-extended/tasks/task-poky-lsb.bb
+++ b/meta/recipes-extended/tasks/task-poky-lsb.bb
@@ -55,6 +55,7 @@ RDEPENDS_task-poky-lsb = "\
#
# GPLv2 Should List
RDEPENDS_task-poky-sys-extended = "\
+ chkconfig \
curl \
dhcp-client \
diffutils \
--
1.7.1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 00/10] Consolidated Pull Request [v2]
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
@ 2011-03-03 23:27 ` Richard Purdie
2011-03-03 22:49 ` [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme Saul Wold
` (10 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2011-03-03 23:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: poky
On Thu, 2011-03-03 at 14:49 -0800, Saul Wold wrote:
> From: Saul Wold <sgw@linux.intel.com>
>
> This contains a batch of bug fixes and a set of recipes
> to address some LSB test failures.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: distro/oe-core
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core
>
> Thanks,
> Saul Wold <sgw@linux.intel.com>
Merged into OE-Core master with the change I've mentioned in a separate
email.
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 00/10] Consolidated Pull Request [v2]
2011-03-03 22:49 [PATCH 00/10] Consolidated Pull Request [v2] Saul Wold
@ 2011-03-03 23:41 ` Richard Purdie
2011-03-03 22:49 ` [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme Saul Wold
` (10 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2011-03-03 23:41 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: poky
On Thu, 2011-03-03 at 14:49 -0800, Saul Wold wrote:
> From: Saul Wold <sgw@linux.intel.com>
>
> This contains a batch of bug fixes and a set of recipes
> to address some LSB test failures.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: distro/oe-core
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core
>
> Thanks,
> Saul Wold <sgw@linux.intel.com>
Sorry, somehow I managed to take the wrong version of this :(
I'll merge a fixup patch for the code differences I missed, its a
learning exercise for us all...
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread