Skip to contentSkip to conversation

fwknop: Upgrade to 2.6.11

PATCH In review Khem Raj 2 participants 7 messages Aug 18, 2024 – Aug 19, 2024

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 fwknop: Upgrade to 2.6.11

---
 ...with-GCC-s-fno-common-flag-fixes-305.patch | 27 -----------------
 ...figure.ac-Fix-missing-comma-in-AS_IF.patch | 29 -------------------
 .../{fwknop_2.6.10.bb => fwknop_2.6.11.bb}    |  8 ++---
 3 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch
 delete mode 100644 meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch
 rename meta-networking/recipes-support/fwknop/{fwknop_2.6.10.bb => fwknop_2.6.11.bb} (77%)
meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch deleted +0 -27
deleted file mode 100644
index e696ac4ead..0000000000
@@ -1,27 +0,0 @@
-From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001
-From: Francois Marier <[email protected]>
-Date: Fri, 24 Jul 2020 21:22:47 -0700
-Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305)
-
-Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319]
-Signed-off-by: Khem Raj <[email protected]>
----
- client/log_msg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/log_msg.h b/client/log_msg.h
-index cc17716..3dda161 100644
---- a/client/log_msg.h
-+++ b/client/log_msg.h
-@@ -38,7 +38,7 @@ enum
-     LOG_VERBOSITY_INFO,         /*!< Constant to define a INFO message */
-     LOG_VERBOSITY_DEBUG,        /*!< Constant to define a DEBUG message */
-     LOG_LAST_VERBOSITY
--} log_level_t;
-+};
- 
- #define LOG_DEFAULT_VERBOSITY   LOG_VERBOSITY_NORMAL    /*!< Default verbosity to use */
- 
--- 
-2.28.0
-
meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch deleted +0 -29
deleted file mode 100644
index f3e1707408..0000000000
@@ -1,29 +0,0 @@
-From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 2 Apr 2023 10:01:51 -0700
-Subject: [PATCH] configure.ac: Fix missing  comma in AS_IF
-
-this is flagged with autconf 2.72
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 47a069e..9cdfd3f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -744,7 +744,7 @@ dnl
-             IPFW_EXE=""
-             IPTABLES_EXE=""
-             FIREWALLD_EXE=""
--          ]
-+          ],
-         ]
-       ]
-     ]
--- 
-2.40.0
-
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb renamed from meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +3 -5
similarity index 77%
rename from meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb
rename to meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb
index a1f56cdf16..c9f9596eb4 100644
@@ -1,16 +1,14 @@
 SUMMARY = "fwknop - Single Packet Authorization"
 HOMEPAGE = "http://www.cipherdyne.org/fwknop/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-		    "
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
 inherit autotools-brokensep pkgconfig
 
 SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \
-           file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \
            file://0001-Use-pkg-config-to-find-gpgme.patch \
-	   file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \
           "
-SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77"
+SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64"
 
 DEPENDS = "libpcap gpgme"
 
author
#1 lore raw

PATCH 2/5 fwknop: Specify target locations of gpg and wget

This fixes emitting buildpaths into binary and also fixes the issue where these tools wont exist on the paths they were found on build machine

---
 meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +3 -1
index c9f9596eb4..0e7998b6dc 100644
@@ -12,7 +12,9 @@ SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6
 
 DEPENDS = "libpcap gpgme"
 
-EXTRA_OECONF = " --with-iptables=${sbindir}/iptables"
+EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \
+				--with-gpg=${bindir}/gpg \
+				--with-wget=${base_bindir}/wget"
 
 do_configure:prepend () {
 	install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config
#2 lore raw

RE: [oe] [meta-networking][PATCH 2/5] fwknop: Specify target locations of gpg and wget

Quoted 21 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: den 19 augusti 2024 00:56
To: [email protected]
Cc: Khem Raj <[email protected]>
Subject: [oe] [meta-networking][PATCH 2/5] fwknop: Specify target locations of gpg and wget

This fixes emitting buildpaths into binary and also fixes the issue where these tools wont exist on the paths they were found on build machine

---
 meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +0 -0
index c9f9596eb4..0e7998b6dc 100644

meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6 · line 17

Quoted 7 lines
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +3 -1
@@ -12,7 +12,9 @@ SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6
 
 DEPENDS = "libpcap gpgme"
 
-EXTRA_OECONF = " --with-iptables=${sbindir}/iptables"
+EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \
+				--with-gpg=${bindir}/gpg \
+				--with-wget=${base_bindir}/wget"

Do you happen to have tabs configured to be four spaces wide? Please use spaces instead for alignment since the above looks weird with 8-character tabs.

meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6 · line 20

Quoted 3 lines
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +0 -0
 do_configure:prepend () {
 	install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config

//Peter

author
#3 lore raw

Re: [oe] [meta-networking][PATCH 2/5] fwknop: Specify target locations of gpg and wget

Quoted 28 lines · Peter Kjellerstedt
Quoted 2 lines

-----Original Message-----
From: [email protected] <

[email protected]> On Behalf Of Khem Raj

Quoted 4 lines

Sent: den 19 augusti 2024 00:56
To: [email protected]
Cc: Khem Raj <[email protected]>
Subject: [oe] [meta-networking][PATCH 2/5] fwknop: Specify target

locations of gpg and wget

Review

Quoted 11 lines

This fixes emitting buildpaths into binary and also fixes the issue where these tools wont exist on the paths they were found on build machine

---
 meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb

meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb SRC_URI[sha256sum] =

Quoted 4 lines

index c9f9596eb4..0e7998b6dc 100644

meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +0 -0
@@ -12,7 +12,9 @@ SRC_URI[sha256sum] =

"a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6

Quoted 3 lines
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +0 -0
 DEPENDS = "libpcap gpgme"
 
Quoted 8 lines

meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6 · line 17

Quoted 4 lines
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +3 -1
-EXTRA_OECONF = " --with-iptables=${sbindir}/iptables"
+EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \
+                             --with-gpg=${bindir}/gpg \
+                             --with-wget=${base_bindir}/wget"

Do you happen to have tabs configured to be four spaces wide? Please use spaces instead for alignment since the above looks weird with 8-character tabs.

It was a different editor than usual thanks for noting

Quoted 9 lines

meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb SRC_URI[sha256sum] = · line 18

Quoted 4 lines
meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb +0 -0
 do_configure:prepend () {
      install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess

${S}/config

//Peter

author
#4 lore raw

PATCH 3/5 ippool: Fix buildpaths QA error

In reply to Khem Raj

Pass OE's CFLAGS via CC since the Makefile disregards these flags from environment and has it own notion of it. This ensures that flags to rewrite debug flags are passed down correctly to compiler.

---
 meta-networking/recipes-daemons/ippool/ippool_1.3.bb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
meta-networking/recipes-daemons/ippool/ippool_1.3.bb +1 -6
index 7947ffe457..90e7814a0f 100644
@@ -42,7 +42,7 @@ inherit systemd
 DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc"
 RDEPENDS:${PN} = "rpcbind"
 
-EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'"
+EXTRA_OEMAKE = "CC='${CC} ${CFLAGS}' AS='${AS}' LD='${LD} ${LDFLAGS}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'"
 EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}"
 # enable self tests
 EXTRA_OEMAKE += "IPPOOL_TEST=y"
@@ -52,12 +52,7 @@ CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc"
 SYSTEMD_SERVICE:${PN} = "ippool.service"
 
 do_compile:prepend() {
-    # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env
-    sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile
-    sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile
-
     sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile
-
 }
 
 
author
#5 lore raw

PATCH 4/5 ot-br-posix: Define config files explicitly

In reply to Khem Raj

Otherwise it picks up from build area with absolute paths into builddir

---
 .../recipes-connectivity/openthread/ot-br-posix_git.bb          | 2 ++
 1 file changed, 2 insertions(+)
meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +2 -0
index 0ec9db9e18..e5f8db24d4 100644
@@ -34,6 +34,8 @@ EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \
                  -DOTBR_REST=ON \
                  -DOTBR_WEB=OFF \
                  -DCMAKE_LIBRARY_PATH=${libdir} \
+                 -DOT_POSIX_PRODUCT_CONFIG=${sysconfdir}/openthread.conf.example \
+                 -DOT_POSIX_FACTORY_CONFIG=${sysconfdir}/openthread.conf.example \
                  -DOTBR_MDNS=avahi \
                  -DOTBR_BACKBONE_ROUTER=ON \
                  -DOTBR_BORDER_ROUTING=ON \
author
#6 lore raw

PATCH 5/5 libyui: Upgrade to 4.6.2

In reply to Khem Raj
---
 ...eplace-off64_t-with-off_t-and-stat64.patch | 176 ------------------
 ...urses_4.2.3.bb => libyui-ncurses_4.6.2.bb} |   8 +-
 .../{libyui_4.2.3.bb => libyui_4.6.2.bb}      |   3 +-
 3 files changed, 7 insertions(+), 180 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch
 rename meta-oe/recipes-graphics/libyui/{libyui-ncurses_4.2.3.bb => libyui-ncurses_4.6.2.bb} (91%)
 rename meta-oe/recipes-graphics/libyui/{libyui_4.2.3.bb => libyui_4.6.2.bb} (93%)
meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch deleted +0 -176
deleted file mode 100644
index b29e5dc7b2..0000000000
@@ -1,176 +0,0 @@
-From b81fb7942ab77b0bf6791e5fd98411dd68f133d9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 18 Dec 2022 15:13:00 -0800
-Subject: [PATCH] libyui-ncurses: Replace off64_t with off_t and stat64 with stat
-
-stat is same as stat64 when 64bit off_t is used.
-
-Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/88]
-Signed-off-by: Khem Raj <[email protected]>
----
- CMakeLists.txt         |  2 +-
- src/NCAskForFile.cc    |  6 +++---
- src/NCFileSelection.cc | 24 ++++++++++++------------
- src/NCFileSelection.h  |  6 +++---
- 4 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/libyui-ncurses/CMakeLists.txt
-index b10eab8e..2000bb58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,7 +58,7 @@ set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make
- # Initialize compiler flags for all targets in all subdirectories
- add_compile_options( "-Wall" )
- add_compile_options( "-Os" )    # Optimize for size (overrides CMake's -O3 in RELEASE builds)
--
-+add_compile_options( "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ) # Enable largefile support
- if ( WERROR )
-   add_compile_options( "-Werror" )
- endif()
-diff --git a/src/NCAskForFile.cc b/libyui-ncurses/src/NCAskForFile.cc
-index aba6e0a6..44bb81bc 100644
---- a/src/NCAskForFile.cc
-+++ b/src/NCAskForFile.cc
-@@ -73,8 +73,8 @@ std::string NCAskForFile::checkIniDir( std::string iniDir )
- {
-     std::string dname = "";
- 
--    struct stat64 statInfo;
--    stat64( iniDir.c_str(), &statInfo );
-+    struct stat statInfo;
-+    stat( iniDir.c_str(), &statInfo );
- 
-     if ( S_ISDIR( statInfo.st_mode ) )
-     {
-@@ -90,7 +90,7 @@ std::string NCAskForFile::checkIniDir( std::string iniDir )
- 	     && pos != 0 )
- 	{
- 	    std::string dir = iniDir.substr( 0, pos );
--	    stat64( dir.c_str(), &statInfo );
-+	    stat( dir.c_str(), &statInfo );
- 
- 	    if ( S_ISDIR( statInfo.st_mode ) )
- 	    {
-diff --git a/src/NCFileSelection.cc b/libyui-ncurses/src/NCFileSelection.cc
-index 3eb9c908..8894dc72 100644
---- a/src/NCFileSelection.cc
-+++ b/src/NCFileSelection.cc
-@@ -46,7 +46,7 @@ using std::list;
- 
- 
- NCFileInfo::NCFileInfo( string	        fileName,
--			struct stat64 *	statInfo,
-+			struct stat *	statInfo,
- 			bool	        link )
- {
-     _name   = fileName;
-@@ -146,7 +146,7 @@ NCFileInfo::NCFileInfo()
-     _mode     = ( mode_t )0;
-     _device   = ( dev_t )0;
-     _links    = ( nlink_t )0;
--    _size     = ( off64_t )0;
-+    _size     = ( off_t )0;
-     _mtime    = ( time_t )0;
- }
- 
-@@ -177,11 +177,11 @@ NCFileSelection::NCFileSelection( YWidget *           parent,
- {
-     SetSepChar( ' ' );
- 
--    struct stat64 statInfo;
-+    struct stat statInfo;
- 
-     if ( !iniDir.empty() )
-     {
--	stat64( iniDir.c_str(), &statInfo );
-+	stat( iniDir.c_str(), &statInfo );
-     }
- 
-     if ( iniDir.empty()
-@@ -559,8 +559,8 @@ NCursesEvent NCFileTable::wHandleInput( wint_t key )
- bool NCFileTable::fillList()
- {
- 
--    struct stat64	statInfo;
--    struct stat64	linkInfo;
-+    struct stat	statInfo;
-+    struct stat	linkInfo;
-     struct dirent *	entry;
-     list<string>	tmpList;
-     list<string>::iterator   it;
-@@ -592,7 +592,7 @@ bool NCFileTable::fillList()
- 	{
- 	    string fullName = currentDir + "/" + ( *it );
- 
--	    if ( lstat64( fullName.c_str(), &statInfo ) == 0 )
-+	    if ( lstat( fullName.c_str(), &statInfo ) == 0 )
- 	    {
- 		if ( S_ISREG( statInfo.st_mode ) || S_ISBLK( statInfo.st_mode ) )
- 		{
-@@ -604,7 +604,7 @@ bool NCFileTable::fillList()
- 		}
- 		else if ( S_ISLNK( statInfo.st_mode ) )
- 		{
--		    if ( stat64( fullName.c_str(), &linkInfo ) == 0 )
-+		    if ( stat( fullName.c_str(), &linkInfo ) == 0 )
- 		    {
- 			if ( S_ISREG( linkInfo.st_mode ) || S_ISBLK( linkInfo.st_mode ) )
- 			{
-@@ -701,8 +701,8 @@ void NCDirectoryTable::fillHeader()
- 
- bool NCDirectoryTable::fillList()
- {
--    struct stat64	statInfo;
--    struct stat64	linkInfo;
-+    struct stat	statInfo;
-+    struct stat	linkInfo;
-     struct dirent *	entry;
-     list<string>	tmpList;
-     list<string>::iterator   it;
-@@ -734,7 +734,7 @@ bool NCDirectoryTable::fillList()
- 	{
- 	    string fullName = currentDir + "/" + ( *it );
- 
--	    if ( lstat64( fullName.c_str(), &statInfo ) == 0 )
-+	    if ( lstat( fullName.c_str(), &statInfo ) == 0 )
- 	    {
- 		if ( S_ISDIR( statInfo.st_mode ) )
- 		{
-@@ -746,7 +746,7 @@ bool NCDirectoryTable::fillList()
- 		}
- 		else if ( S_ISLNK( statInfo.st_mode ) )
- 		{
--		    if ( stat64( fullName.c_str(), &linkInfo ) == 0 )
-+		    if ( stat( fullName.c_str(), &linkInfo ) == 0 )
- 		    {
- 			if ( S_ISDIR( linkInfo.st_mode ) )
- 			{
-diff --git a/src/NCFileSelection.h b/libyui-ncurses/src/NCFileSelection.h
-index 0569215d..5c459d62 100644
---- a/src/NCFileSelection.h
-+++ b/src/NCFileSelection.h
-@@ -44,10 +44,10 @@
- struct NCFileInfo
- {
-     /**
--     * Constructor from a stat buffer (i.e. based on an lstat64() call).
-+     * Constructor from a stat buffer (i.e. based on an lstat() call).
-      **/
-     NCFileInfo( std::string	fileName,
--		struct stat64	* statInfo,
-+		struct stat	* statInfo,
- 		bool link	= false );
- 
-     NCFileInfo();
-@@ -65,7 +65,7 @@ struct NCFileInfo
-     dev_t		_device;	// device this object resides on
-     mode_t		_mode;		// file permissions + object type
-     nlink_t		_links;		// number of links
--    off64_t		_size;		// size in bytes
-+    off_t		_size;		// size in bytes
-     time_t		_mtime;		// modification time
- 
-     bool isDir()  { return (( S_ISDIR( _mode ) ) ? true : false ); }
--- 
-2.39.0
-
meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb renamed from meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb +5 -3
similarity index 91%
rename from meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb
rename to meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb
index bcc5ef33e2..34286f5013 100644
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0
 "
 
 SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
-           file://0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch \
           "
 
 SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
 
-SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac"
+SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516"
 
 S = "${WORKDIR}/git/libyui-ncurses"
 
@@ -20,9 +19,10 @@ DEPENDS += "boost libyui ncurses"
 
 BBCLASSEXTEND = "nativesdk"
 
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF"
+EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF -DCMAKE_SKIP_RPATH=1"
 
 CXXFLAGS += "-DNCURSES_WIDECHAR"
+LDFLAGS += "-L${B}/src"
 
 do_configure:prepend () {
     cd ${S}
@@ -48,3 +48,5 @@ do_install:append:class-nativesdk () {
 FILES:${PN} += "${datadir}/*"
 
 FILES:${PN}-dev += "${libdir}/*"
+
+CMAKE_VERBOSE = "VERBOSE=1" 
meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb renamed from meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb +2 -1
similarity index 93%
rename from meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb
rename to meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb
index 939f3f36e5..419a9522a4 100644
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
            file://0001-Use-relative-install-paths-for-CMake.patch \
            "
 
-SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac"
+SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516"
 
 S = "${WORKDIR}/git/libyui"
 
@@ -20,6 +20,7 @@ DEPENDS += "boost"
 
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF"
 
+LDFLAGS += "-L${B}/src"
 BBCLASSEXTEND = "native nativesdk"
 
 do_install:append () {