Skip to contentSkip to conversation

tinyalsa: fix installation libdir path to match multilibs

PATCH In review Khem Raj 3 participants 6 messages Dec 18, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 tinyalsa: fix installation libdir path to match multilibs

Fixes
ERROR: tinyalsa-1.1.1+gitAUTOINC+8449529c7e-r0 do_package: QA Issue: tinyalsa: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libtinyalsa.a
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Cc Andreas Müller <[email protected]>
---
 .../recipes-multimedia/tinyalsa/tinyalsa.bb   |  4 +-
 ...L_-path-instead-of-hardcoding-bin-li.patch | 46 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb +3 -1
index 8b86f82430..062096892e 100644
@@ -7,7 +7,9 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b"
 
 SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5"
-SRC_URI = "git://github.com/tinyalsa/tinyalsa"
+SRC_URI = "git://github.com/tinyalsa/tinyalsa \
+           file://0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch \
+          "
 PV = "1.1.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch new file +46 -0

46 lines not on this page · raw message

Signature · 1 line
2.24.1
author
#1 lore raw

PATCH 2/3 libqb: Add --enable-nosection-fallback with mips64/clang

Same issue happens with clang/mips64 so extend the gold fix to cover for this case

---
 meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +5 -1
index b205186e0b..82503a168b 100644
@@ -22,9 +22,13 @@ S = "${WORKDIR}/git"
 # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script
 # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791
 # collect2: error: ld returned 1 exit status
-EXTRA_OECONF_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' --enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK_toolchain-clang_mips64 = "--enable-nosection-fallback"
+
+EXTRA_OECONF += "${NOSECTION_FALLBACK}"
 
 CFLAGS += "-pthread -D_REENTRANT"
+
 do_configure_prepend() {
     ( cd ${S}
     ${S}/autogen.sh )
Signature · 1 line
2.24.1
#2 lore raw

Re: [meta-oe][PATCH 2/3] libqb: Add --enable-nosection-fallback with mips64/clang

Quoted 13 lines · Khem Raj

Same issue happens with clang/mips64 so extend the gold fix to cover for this case

---
 meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +0 -0
index b205186e0b..82503a168b 100644

meta-oe/recipes-extended/libqb/libqb_1.0.5.bb S = "${WORKDIR}/git" · line 26

Quoted 7 lines
meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +2 -1
@@ -22,9 +22,13 @@ S = "${WORKDIR}/git"
 # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script
 # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791
 # collect2: error: ld returned 1 exit status
-EXTRA_OECONF_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' --enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK_toolchain-clang_mips64 = "--enable-nosection-fallback"
...

Removing these fragile linker tricks is the main change in the 1.9.0 (pre-)release, upgrading might be a better option than collecting more cases where the removed code broke.

cu
Adrian

author
#3 lore raw

Re: [meta-oe][PATCH 2/3] libqb: Add --enable-nosection-fallback with mips64/clang

Quoted 10 lines · Adrian Bunk
Quoted 8 lines · Khem Raj

Same issue happens with clang/mips64 so extend the gold fix to cover for this case

---
 meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 14 lines

meta-oe/recipes-extended/libqb/libqb_1.0.5.bb S = "${WORKDIR}/git" · line 26

Quoted 12 lines
meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +2 -1
index b205186e0b..82503a168b 100644
@@ -22,9 +22,13 @@ S = "${WORKDIR}/git"
 # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script
 # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791
 # collect2: error: ld returned 1 exit status
-EXTRA_OECONF_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' --enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK_toolchain-clang_mips64 = "--enable-nosection-fallback"
...

Removing these fragile linker tricks is the main change in the 1.9.0

its lot more than that and I am not planning to do major upgrade
https://github.com/ClusterLabs/libqb/releases/tag/1.9.0

Quoted 3 lines

(pre-)release, upgrading might be a better option than collecting more cases where the removed code broke.

Certain when upgrade to 2.0 is done this will/should be reviewed.

author
#4 lore raw

PATCH 3/3 lcdproc: Upgrade to latest top of tree

In reply to Khem Raj

* Drop BASEPV, used only once
* serialVFD needs to use ioperm, inb and outb which are only on x86 32/64

---
 ...ld-fix-port-internal-make-dependenci.patch | 12 +++---
 ...ude-limits.h-for-PATH_MAX-definition.patch | 41 +++++++++++++++++++
 .../0003-Fix-non-x86-platforms-on-musl.patch  | 35 ++++++++++++++++
 .../recipes-extended/lcdproc/lcdproc_git.bb   | 17 ++++----
 4 files changed, 92 insertions(+), 13 deletions(-)
 create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
 create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch +6 -6
index 8505ea34c8..f6a7956db2 100644
@@ -1,17 +1,17 @@
-From 67d808b8739817c122bed8ba1a8308d01cb5ad0b Mon Sep 17 00:00:00 2001
+From a20feee4963bc38975fbaf44bbe85a31825f59db Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 6 Apr 2019 17:28:28 -0700
-Subject: [PATCH] Fix parallel build (fix port-internal make dependencies) on
- many cores
+Subject: [PATCH 1/3] Fix parallel build (fix port-internal make dependencies)
+ on many cores
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142]
 Signed-off-by: Khem Raj <[email protected]>
 ---
  server/drivers/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
-index 0c23a9b..6777047 100644
+index e08f2b2d..4fd2e3f1 100644
 --- a/server/drivers/Makefile.am
 +++ b/server/drivers/Makefile.am
 @@ -47,11 +47,11 @@ CwLnx_LDADD =        libLCD.a libbignum.a
@@ -29,5 +29,5 @@ index 0c23a9b..6777047 100644
  imon_LDADD =         libLCD.a libbignum.a
  imonlcd_LDADD =      libLCD.a
 -- 
-2.21.0
+2.24.1
 
meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch new file +41 -0

41 lines not on this page · raw message

meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch new file +35 -0
new file mode 100644
index 0000000000..e39e9bda14
@@ -0,0 +1,35 @@
+From 7fd144f101fa5c9316d3468ed26f55629afe1305 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 17 Dec 2019 17:55:54 -0800
+Subject: [PATCH 3/3] Fix non x86 platforms on musl
+
+Musl only specifies in/outb for x86/x86. Use the fallback path in case
+musl is used.
+
+This should fail compilation during the linking stage but for some reason
+does not. Will do if -Werror=implicit-function-declaration is specified.
+
+Original here: https://github.com/openwrt/packages/blob/master/utils/lcdproc/patches/110-in-outb.patch
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ server/drivers/port.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/drivers/port.h b/server/drivers/port.h
+index c584cd4e..bde235b3 100644
+--- a/server/drivers/port.h
++++ b/server/drivers/port.h
+@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count);
+ /*  ---------------------------- Linux ------------------------------------ */
+ /*  Use ioperm, inb and outb in <sys/io.h> (Linux) */
+ /*  And iopl for higher addresses of PCI LPT cards */
+-#if defined HAVE_IOPERM
++#if defined(__GLIBC__) || (defined(__x86__) || defined(__x86_64__))
+ 
+ /* Glibc2 and Glibc1 */
+ # ifdef HAVE_SYS_IO_H
+-- 
+2.24.1
+
meta-oe/recipes-extended/lcdproc/lcdproc_git.bb +10 -7
index 7ddc55f5e7..275b984e47 100644
@@ -7,22 +7,25 @@ LICENSE = "GPLv2+"
 DEPENDS = "ncurses lirc"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
-                    file://README.md;beginline=107;md5=5c927ce1742d6d5cddc45b7ad6230f75"
+                    file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58"
 
-BASEPV = "0.5.9"
-PV = "${BASEPV}+git${SRCPV}"
-SRCREV = "e08546c13a4157ed98cd4a8e9086e7acd66f93c0"
+PV = "0.5.9+git${SRCPV}"
+SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134"
 SRC_URI = "git://github.com/lcdproc/lcdproc \
            file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \
+           file://0002-Include-limits.h-for-PATH_MAX-definition.patch \
+           file://0003-Fix-non-x86-platforms-on-musl.patch \
            "
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-rc.d
 
-LCD_DRIVERS ?= "all,!irman,!svga"
-LCD_DRIVERS_append_aarch64 = ",!serialVFD"
-LCD_DRIVERS_append_arm = ",!serialVFD"
+LCD_DRIVERS ?= "all,!irman,!svga${SERIALVFD}"
+SERIALVFD ?= ""
+SERIALVFD_libc-musl = ",!serialVFD"
+SERIALVFD_libc-musl_x86 = ""
+SERIALVFD_libc-musl_x86-64 = ""
 
 LCD_DEFAULT_DRIVER ?= "curses"
 
Signature · 1 line
2.24.1
Acked-by on v1 1/3
#5 lore raw
In reply to Khem Raj
Quoted 9 lines · Khem Raj

Fixes
ERROR: tinyalsa-1.1.1+gitAUTOINC+8449529c7e-r0 do_package: QA Issue: tinyalsa: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libtinyalsa.a
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Cc Andreas Müller <[email protected]>