syslinux.bbclass: pull ldlinux.sys and isolinux.bin from correct places
PATCH v2 9/21 syslinux.bbclass: pull ldlinux.sys and isolinux.bin from correct places
From: Joe Slater <[email protected]>
ldlinux.sys is used when building an hdd image, and isolinux.bin when building an iso bootimage. In both cases, we want to look in the sysroot for MACHINE, not in the one for the multilib we might be using.
Signed-off-by Joe Slater <[email protected]>
Signed-off-by Jason Wessel <[email protected]>
Signed-off-by Mark Hatle <[email protected]>
--- meta/classes/syslinux.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta/classes/syslinux.bbclass +6 -4
@@ -38,11 +38,13 @@ syslinux_populate() { install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME} } +# we want to pull isolinux.bin and ldlinux.sys from the MACHINE sysroot +# syslinux_iso_populate() { syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg - install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} + install -m 0644 ${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then - install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 + install -m 0644 ${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 if [ "${SYSLINUX_SPLASH}" != "" ] ; then install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss fi
@@ -51,9 +53,9 @@ syslinux_iso_populate() { syslinux_hddimg_populate() { syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg - install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys + install -m 0444 ${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then - install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 + install -m 0644 ${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 if [ "${SYSLINUX_SPLASH}" != "" ] ; then install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss fi
Signature · 1 line
1.8.1.2.545.g2f19ada
PATCH v2 15/21 libnl: fix two parentheses bugs in lib/cache_mngr.c file
From: "Song.Li" <[email protected]>
there are two parentheses bugs in libnl /lib/cache_mngr.c file. The parentheses doesn't make any sense,
This will cause the variable err get a bool value, the correct value of variable err should be the return value of the function which can be any integer value.
Signed-off-by Song Li <[email protected]>
Signed-off-by Mark Hatle <[email protected]>
--- ...fix-lib-cache_mngr.c-two-parentheses-bugs.patch | 37 ++++++++++++++++++++++ meta/recipes-support/libnl/libnl_3.2.22.bb | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch
meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 82fdf49c185fd5f3810781af9ef52aa6a52bf2df Mon Sep 17 00:00:00 2001 +From: "Song.Li" <[email protected]> +Date: Thu, 28 Jun 2012 20:03:17 +0800 +Subject: [PATCH] fix lib/cache_mngr.c two parentheses bugs + +there are two parentheses bugs in libnl /lib/cache_mngr.c file. +The parentheses doesn't make any sense, +This will cause the variable err get a bool value, +the correct value of variable err should be the return value +of the function which can be any integer value. + +--- + lib/cache_mngr.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Upstream-status: Pending + +diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c +index dae8768..57cc1f9 100644 +--- a/lib/cache_mngr.c ++++ b/lib/cache_mngr.c +@@ -150,10 +150,10 @@ int nl_cache_mngr_alloc(struct nl_sock *sk, int protocol, int flags, + /* Required to receive async event notifications */ + nl_socket_disable_seq_check(mngr->cm_sock); + +- if ((err = nl_connect(mngr->cm_sock, protocol) < 0)) ++ if ((err = nl_connect(mngr->cm_sock, protocol)) < 0) + goto errout; + +- if ((err = nl_socket_set_nonblocking(mngr->cm_sock) < 0)) ++ if ((err = nl_socket_set_nonblocking(mngr->cm_sock)) < 0) + goto errout; + + NL_DBG(1, "Allocated cache manager %p, protocol %d, %d caches\n", +-- +1.7.9.5 +
meta/recipes-support/libnl/libnl_3.2.22.bb +2 -1
@@ -11,7 +11,8 @@ DEPENDS = "flex-native bison-native" SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ file://fix-pktloc_syntax_h-race.patch \ - file://fix-pc-file.patch " + file://fix-pc-file.patch \ + file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch" SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e" SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b"
Signature · 1 line
1.8.1.2.545.g2f19ada
PATCH v2 18/21 ncurses: Fix problems expanding ncurses-libtinfo when in IMAGE_INSTALL
In reply to Mark HatleFrom: Jason Wessel <[email protected]>
The ncurses package was generating the following error as a result of not specifing the PACKAGES_DYNAMIC correctly. This error only appear when using the IMAGE_INSTALL list that has been expanded by the hob or from the pkgdata.
ERROR: Nothing RPROVIDES 'ncurses-libtinfo'
Signed-off-by Jason Wessel <[email protected]>
Signed-off-by Mark Hatle <[email protected]>
--- meta/recipes-core/ncurses/ncurses.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-core/ncurses/ncurses.inc +2 -0
@@ -29,6 +29,8 @@ BUILD_CPPFLAGS += "-D_GNU_SOURCE" # natives don't generally look in base_libdir base_libdir_class-native = "${libdir}" +PACKAGES_DYNAMIC = "^${PN}-.*" + # Fall back to the host termcap / terminfo for -nativesdk and -native # The reality is a work around for strange problems with things like # "bitbake -c menuconfig busybox" where it cannot find the terminfo
Signature · 1 line
1.8.1.2.545.g2f19ada