Colsolidated Pull Request
cover Colsolidated Pull Request
From: Saul Wold <[email protected]>
This group of patches addresses a number of bug fixes from the Yocto Project Bugzilla. It also includes some support for LSB testing.
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 <[email protected]>
---
Kang Kai (3):
recipe: add chkconfig for LSB command test
recipe: add newt from OE
recipe: add slang from OE
Liping Ke (2):
Add libtool-nativesdk for ADT
ADT: Bug fix for Suse Linux
Qing He (1):
libpcre: fix the name collision with libc
Saul Wold (1):
task-poky-lsb: add chkconfig
Zhai Edwin (3):
x11vnc: Fix the start failure
sato-icon-theme: Explictly use "Sato" as gtk icon theme
gstreamer: install the sound card driver of es1370
.../adt-installer/scripts/adt_installer_internal | 5 +- .../installer/adt-installer/scripts/data_define | 2 +- .../recipes-extended/chkconfig/chkconfig_1.3.49.bb | 27 ++++++++ .../newt/files/include-without-python.patch | 71 ++++++++++++++++++++ meta/recipes-extended/newt/libnewt_0.52.12.bb | 37 ++++++++++ meta/recipes-extended/slang/slang/fix-uclibc.patch | 11 +++ meta/recipes-extended/slang/slang_2.2.2.bb | 25 +++++++ meta/recipes-extended/tasks/task-poky-lsb.bb | 1 + .../x11vnc/files/starting-fix.patch | 18 +++++ meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb | 3 +- .../gstreamer/gstreamer_0.10.31.bb | 3 + .../sato-icon-theme/sato-icon-theme.inc | 3 + .../libpcre/files/fix-pcre-name-collision.patch | 40 +++++++++++ meta/recipes-support/libpcre/libpcre_8.10.bb | 5 +- 14 files changed, 246 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb create mode 100644 meta/recipes-extended/newt/files/include-without-python.patch create mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bb create mode 100644 meta/recipes-extended/slang/slang/fix-uclibc.patch create mode 100644 meta/recipes-extended/slang/slang_2.2.2.bb create mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch create mode 100644 meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch
PATCH 1/10 libpcre: fix the name collision with libc
From: Qing He <[email protected]>
fixes [YOCTO #721] [YOCTO #722]
--- .../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
meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch new file +40 -0
@@ -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 <[email protected]> +Signed-off-by: Saul Wold <[email protected]> + +--- 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 */
meta/recipes-support/libpcre/libpcre_8.10.bb +3 -2
@@ -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"
Signature · 1 line
1.7.1.1
PATCH 2/10 x11vnc: Fix the start failure
In reply to Saul WoldFrom: Zhai Edwin <[email protected]>
Default parameter "-gui" and "-rfbport" make x11vnc failed to start if no "wish" installed.
[BUGID #781] got fixed.
--- .../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
meta/recipes-graphics/x11vnc/files/starting-fix.patch new file +18 -0
@@ -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 <[email protected]> +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
meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb +2 -1
@@ -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;patch=1" SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00" SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"
Signature · 1 line
1.7.1.1
Re: [poky] [PATCH 02/10] x11vnc: Fix the start failure
Quoted 46 lines · Saul Wold
From: Zhai Edwin <[email protected]>
Default parameter "-gui" and "-rfbport" make x11vnc failed to start if no "wish" installed.
[BUGID #781] got fixed.
Signed-off-by Zhai Edwin <[email protected]>---
.../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.patchmeta/recipes-graphics/x11vnc/files/starting-fix.patch new file +18
-0@@ -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 <[email protected]> +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=Applicationmeta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb +0
-0@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ · line 13
Quoted 3 lines
meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb +2
-1-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\ + file://starting-fix.patch;patch=1"
if it is a patch file with .patch extention then bitbake is smart to treat it as patch you dont need patch=1
Quoted 11 lines
SRC_URI[md5sum] = "
1498a68d02aa7b6c97bf746c073c8d00"
SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79" --
1.7.1.1_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
PATCH 3/10 sato-icon-theme: Explictly use "Sato" as gtk icon theme
In reply to Saul WoldFrom: Zhai Edwin <[email protected]>
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.
--- .../sato-icon-theme/sato-icon-theme.inc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +3 -0
@@ -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 }
Signature · 1 line
1.7.1.1
Re: [poky] [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
Quoted 23 lines · Saul Wold
From: Zhai Edwin <[email protected]>
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 <[email protected]>---
.../sato-icon-theme/sato-icon-theme.inc | 3 +++1 files changed, 3 insertions(+), 0 deletions(-)meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +0
-0@@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +2
-0+#explictly setting "Sato" as default icon theme to avoid icon missing due to +#tricky race condition
Quoted 6 lines
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
what would happen if you reinstalled this packge again I guess it would keep appending right ?
Quoted 9 lines
}
--
1.7.1.1_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Re: [poky] [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
Quoted 19 lines · Khem Raj
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc PACKAGE_ARCH = "all" · line 17
Quoted 7 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +0
-0@@ -16,9 +16,12 @@ PACKAGE_ARCH = "all" EXTRA_OECONF +="--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc PACKAGE_ARCH = "all" · line 18
Quoted 2 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +1
-0+#explictly setting "Sato" as default icon theme to avoid iconmissing due to
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc PACKAGE_ARCH = "all" · line 26
Quoted 7 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +2
-0+#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
Quoted 3 lines
what would happen if you reinstalled this packge again I guess it would keep appending right ?
I think postinst only got called via init script on 1st boot of the image, so it should be okay.
Quoted 15 lines
Quoted 10 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +0
-1} --1.7.1.1
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Re: [poky] [PATCH 03/10] sato-icon-theme: Explictly use "Sato" as gtk icon theme
Op 4 mrt 2011, om 01:58 heeft Zhai, Edwin het volgende geschreven:
Quoted 24 lines
Quoted 8 lines · Khem Raj
Quoted 8 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +0
-0@@ -16,9 +16,12 @@ PACKAGE_ARCH = "all" EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"Quoted 12 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc PACKAGE_ARCH = "all" · line 26
Quoted 8 lines
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +3
-0+#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/gtkrcwhat would happen if you reinstalled this packge again I guess it would keep appending right ?
Quoted 1 line
I think postinst only got called via init script on 1st boot of the image, so it should be okay.
Postinst get called every time your install, reinstall or upgrade a package.
regards,
Koen
PATCH 4/10 gstreamer: install the sound card driver of es1370
In reply to Saul WoldFrom: Zhai Edwin <[email protected]>
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]
--- .../gstreamer/gstreamer_0.10.31.bb | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb +3 -0
@@ -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/"
Signature · 1 line
1.7.1.1
PATCH 5/10 Add libtool-nativesdk for ADT
In reply to Saul WoldFrom: Liping Ke <[email protected]>
We need to add libtool native sdk support in ADT installer. This patch fix #bug 791
--- .../adt-installer/scripts/adt_installer_internal | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +3 -0
@@ -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/'`
Signature · 1 line
1.7.1.1
PATCH 6/10 ADT: Bug fix for Suse Linux
In reply to Saul WoldFrom: Liping Ke <[email protected]>
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]
--- .../adt-installer/scripts/adt_installer_internal | 2 +- .../installer/adt-installer/scripts/data_define | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +1 -1
@@ -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
meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -1
@@ -23,7 +23,7 @@ # THE SOFTWARE. config_file="adt_installer.conf" -source $config_file +source `eval echo $PWD`/$config_file LOCAL_OPKG_LOC="./opkg/build/opkg" LOCAL_OPKG_FOLDER="./opkg/build"
Signature · 1 line
1.7.1.1
Re: [poky] [PATCH 06/10] ADT: Bug fix for Suse Linux
Quoted 35 lines · Saul Wold
From: Liping Ke <[email protected]>
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]
Signed-off-by Liping Ke <[email protected]>---
.../adt-installer/scripts/adt_installer_internal | 2 +- .../installer/adt-installer/scripts/data_define | 2 +-2 files changed, 2 insertions(+), 2 deletions(-)meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +0
-0@@ -81,7 +81,7 @@ elsefi
#first update repository
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +1
-1-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_FILEmeta/recipes-devtools/installer/adt-installer/scripts/data_define +0
-0@@ -23,7 +23,7 @@ # THE SOFTWARE.config_file="adt_installer.conf"
meta/recipes-devtools/installer/adt-installer/scripts/data_define line 26
Quoted 2 lines
meta/recipes-devtools/installer/adt-installer/scripts/data_define +1
-1-source $config_file +source `eval echo $PWD`/$config_file
would just using source pwd/$config_file work here
Quoted 11 lines
LOCAL_OPKG_LOC="./opkg/build/opkg"
LOCAL_OPKG_FOLDER="./opkg/build"
--
1.7.1.1_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
PATCH 7/10 recipe: add chkconfig for LSB command test
In reply to Saul WoldFrom: Kang Kai <[email protected]>
chkconfig is a system tool for maintaining the /etc/rc*.d hierarchy, and LSB command test will check 2 links point to command chkconfig
--- .../recipes-extended/chkconfig/chkconfig_1.3.49.bb | 27 ++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb new file +27 -0
@@ -0,0 +1,27 @@ +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/rc.d/init.d +# mkdir -p ${D}/etc/rc.d/rc{0,1,2,3,4,5,6}.d + mkdir -p ${D}/etc/chkconfig.d +}
Signature · 1 line
1.7.1.1
Re: [poky] [PATCH 07/10] recipe: add chkconfig for LSB command test
Quoted 32 lines · Saul Wold
From: Kang Kai <[email protected]>
chkconfig is a system tool for maintaining the
/etc/rc*.dhierarchy, and LSB command test will check 2 links point to command chkconfigSigned-off-by Kang Kai <[email protected]>---
.../recipes-extended/chkconfig/chkconfig_1.3.49.bb | 27 ++++++++++++++++++++1 files changed, 27 insertions(+), 0 deletions(-)create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb new file +15
-0@@ -0,0 +1,27 @@ +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"
meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb line 25
Quoted 10 lines
meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb new file +10
-0+ +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/rc.d/init.d +# mkdir -p ${D}/etc/rc.d/rc{0,1,2,3,4,5,6}.d
these comments can be removed I guess.
Quoted 10 lines
meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb new file +2
-1+ mkdir -p ${D}/etc/chkconfig.d +} --1.7.1.1
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
PATCH 8/10 recipe: add newt from OE
In reply to Saul WoldFrom: Kang Kai <[email protected]>
newt is a library for text mode user interfaces, and required by chkconfig because of LSB command test.
--- .../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
meta/recipes-extended/newt/files/include-without-python.patch new file +71 -0
@@ -0,0 +1,71 @@ +From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <[email protected]> +Date: Thu, 20 Jan 2011 14:14:51 -0200 +Subject: [PATCH] build: add -without-python + +Signed-off-by: Otavio Salvador <[email protected]> +--- + 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 +
meta/recipes-extended/newt/libnewt_0.52.12.bb new file +37 -0
@@ -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"
Signature · 1 line
1.7.1.1
Re: [poky] [PATCH 08/10] recipe: add newt from OE
Quoted 4 lines · Saul Wold
From: Kang Kai <[email protected]>
newt is a library for text mode user interfaces, and required by chkconfig because of LSB command test.
may be mentioned the commit SHA of this file from OE repo would be nice to have
Quoted 137 lines
Signed-off-by Kang Kai <[email protected]>---
.../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.patchcreate mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bbmeta/recipes-extended/newt/files/include-without-python.patch new file +71
-0@@ -0,0 +1,71 @@ +From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <[email protected]> +Date: Thu, 20 Jan 2011 14:14:51 -0200 +Subject: [PATCH] build: add -without-python + +Signed-off-by: Otavio Salvador <[email protected]> +--- + 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 +meta/recipes-extended/newt/libnewt_0.52.12.bb new file +37
-1@@ -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
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Re: [poky] [PATCH 08/10] recipe: add newt from OE
Quoted 7 lines · Khem Raj
Quoted 4 lines · Saul Wold
From: Kang Kai<[email protected]>
newt is a library for text mode user interfaces, and required by chkconfig because of LSB command test.
may be mentioned the commit SHA of this file from OE repo would be nice to have
Thank you. I will add the original informations next time.
Quoted 140 lines
Quoted 131 lines
Signed-off-by Kang Kai<[email protected]>--- .../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.patchcreate mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bbmeta/recipes-extended/newt/files/include-without-python.patch new file +71
-0@@ -0,0 +1,71 @@ +From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001 +From: Otavio Salvador<[email protected]> +Date: Thu, 20 Jan 2011 14:14:51 -0200 +Subject: [PATCH] build: add -without-python + +Signed-off-by: Otavio Salvador<[email protected]> +--- + 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 +meta/recipes-extended/newt/libnewt_0.52.12.bb new file +37
-1@@ -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
Quoted 5 lines
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
PATCH 9/10 recipe: add slang from OE
In reply to Saul WoldFrom: Kang Kai <[email protected]>
slang is the shared library for the S-Lang extension language, and required by newt because of LSB command check
--- 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
meta/recipes-extended/slang/slang/fix-uclibc.patch new file +11 -0
@@ -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
meta/recipes-extended/slang/slang_2.2.2.bb new file +25 -0
@@ -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"
Signature · 1 line
1.7.1.1
Re: [PATCH 09/10] recipe: add slang from OE
Quoted 6 lines · Saul Wold
From: Kang Kai <[email protected]>
slang is the shared library for the S-Lang extension language, and required by newt because of LSB command check
Signed-off-by Kang Kai <[email protected]>
same thing for recipes imported from OE make note of last commit on the recipe that it came from. Probably adding patch header to patches would be nice to have as well.
Quoted 64 lines
---
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.patchcreate mode 100644 meta/recipes-extended/slang/slang_2.2.2.bbmeta/recipes-extended/slang/slang/fix-uclibc.patch new file +11
-0@@ -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 + #endifmeta/recipes-extended/slang/slang_2.2.2.bb new file +25
-1@@ -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
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 09/10] recipe: add slang from OE
Quoted 11 lines · Khem Raj
Quoted 6 lines · Saul Wold
From: Kang Kai <[email protected]>
slang is the shared library for the S-Lang extension language, and required by newt because of LSB command check
Signed-off-by Kang Kai <[email protected]>same thing for recipes imported from OE make note of last commit on the recipe that it came from. Probably adding patch header to patches would be nice to have as well.
Agreed, but I did merge these this time (a one off) to try and unblock some bottleneck issues. I'm asking Saul to ensure the Yocto distro people know to start doing this.
On the plus side, I've improved my scripts a lot to help move these patches around and the various repos are starting to align better and it should be easier to keep them that way.
Cheers,
Richard
PATCH 10/10 task-poky-lsb: add chkconfig
In reply to Saul WoldFrom: Saul Wold <[email protected]>
--- meta/recipes-extended/tasks/task-poky-lsb.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-extended/tasks/task-poky-lsb.bb +1 -0
@@ -55,6 +55,7 @@ RDEPENDS_task-poky-lsb = "\ # # GPLv2 Should List RDEPENDS_task-poky-sys-extended = "\ + chkconfig \ curl \ dhcp-client \ diffutils \
Signature · 1 line
1.7.1.1