Skip to contentSkip to conversation

libmikmod: use SOURCEFORGE_MIRROR

PATCH New Martin Jansa 1 participant 11 messages Dec 31, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 libmikmod: use SOURCEFORGE_MIRROR

* archives are no longer available on old URL

---
 meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb +1 -1
index 4ab293f..e0a04ae 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b"
 DEPENDS = "alsa-lib texinfo"
 
 SRC_URI = "\
-    http://mikmod.shlomifish.org/files/${P}.tar.gz \
+    ${SOURCEFORGE_MIRROR}/project/mikmod/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
 "
 SRC_URI[md5sum] = "60ac77a804d082230df3009af11ef44f"
 SRC_URI[sha256sum] = "2311b209255bf24e95161907a16778cb054ac6d447fd8d05f1f0e41a555c7580"
Signature · 1 line
1.8.4.3
#1 lore raw

PATCH 2/11 tbb: Disable thumb

---
 meta-oe/recipes-support/tbb/tbb_4.1.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
meta-oe/recipes-support/tbb/tbb_4.1.bb +8 -0
index 96137bc..55212dc 100644
@@ -30,3 +30,11 @@ do_install() {
     install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir}
     install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig
 }
+
+# fails with thumb enabled:
+# | arm-oe-linux-gnueabi-g++  -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG  -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden   -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp
+# | {standard input}: Assembler messages:
+# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]'
+# ...
+# | make[1]: *** [concurrent_queue.o] Error 1
+ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
1.8.4.3
#2 lore raw

PATCH 3/11 rfkill: Fix build when WORKDIR is included in some git checkout

In reply to Martin Jansa
---
 .../dont.call.git.rev-parse.on.parent.dir.patch    | 31 ++++++++++++++++++++++
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb  |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch new file +31 -0
new file mode 100644
index 0000000..2b83689
@@ -0,0 +1,31 @@
+When WORKDIR is included in some other git checkout, version.sh calls git rev-parse
+and it returns some description from that upper git checkout even when rfkill is
+being built from release tarball.
+
+When returned description doesn't match with expected v0.4, version.sh exits
+without creating version.c
+    # on git builds check that the version number above
+    # is correct...
+    [ "${descr%%-*}" = "v$VERSION" ] || exit 2
+
+and build fails a bit later:
+    | NOTE: make -j 32 -e MAKEFLAGS=
+    |  CC   rfkill.o
+    |  GEN  version.c
+    | make: *** [version.c] Error 2
+    | make: *** Waiting for unfinished jobs....
+    | ERROR: oe_runmake failed
+
+Don't try git rev-parse, if there isn't .git in ${S}.
+
+--- a/version.sh	2013-11-15 03:43:12.587744366 -0800
++++ b/version.sh	2013-11-15 03:42:40.699743320 -0800
+@@ -12,7 +12,7 @@
+ 
+ if test "x$SUFFIX" != 'x'; then
+ 	v="$VERSION$SUFFIX"
+-elif head=`git rev-parse --verify HEAD 2>/dev/null`; then
++elif test -d .git && head=`git rev-parse --verify HEAD 2>/dev/null`; then
+ 	git update-index --refresh --unmerged > /dev/null
+ 	descr=$(git describe 2>/dev/null || echo "v$VERSION")
+ 
meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +2 -1
index f90736d..1c2930a 100644
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
 PR = "r1"
 
 SRC_URI = "http://wireless.kernel.org/download/${PN}/${P}.tar.bz2 \
-           file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch"
+           file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch \
+           file://dont.call.git.rev-parse.on.parent.dir.patch"
 
 SRC_URI[md5sum] = "727892c0fb35c80ee3849fbe89b45350"
 SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1"
Signature · 1 line
1.8.4.3
#3 lore raw

PATCH 4/11 cifs-utils: Add PACKAGECONFIG for cifscreds, cifsupcall

In reply to Martin Jansa

From: Martin Jansa <[email protected]>

* make files in bindir/sbindir a bit more deterministic

---
 meta-networking/recipes-support/cifs/cifs-utils_git.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta-networking/recipes-support/cifs/cifs-utils_git.bb +4 -0
index fc7a4d3..92be75e 100644
@@ -14,6 +14,10 @@ S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap"
+# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed
+PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils"
+# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed
+PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 talloc keyutils"
 
 inherit autotools pkgconfig
 
Signature · 1 line
1.8.4.3
#4 lore raw

PATCH 5/11 libdvdread: Use _remove operator to drop silent rules

In reply to Martin Jansa

* replace causes different signatures for different MACHINES, see
http://lists.openembedded.org/pipermail/openembedded-core/2013-November/086510.html

---
 meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb +1 -1
index d5695ca..afc8a14 100644
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5a
 
 inherit autotools lib_package binconfig pkgconfig
 
-CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--disable-silent-rules', ' ')}"
+CONFIGUREOPTS_remove = "--disable-silent-rules"
 
 do_configure_prepend() {
     # For some weird reason, libdvdread only provides a `configure2' script...
Signature · 1 line
1.8.4.3
#5 lore raw

PATCH 6/11 gateone: Drop allarch

In reply to Martin Jansa

* runtime dependencies are TUNE_PKGARCH causing do_package_write_* task to have different signature for MACHINEs with different TUNE_PKGARCH

---
 meta-oe/recipes-connectivity/gateone/gateone_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/gateone/gateone_git.bb +1 -1
index 85c32cc..ac5aa5b 100644
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/liftoff/GateOne.git \
 
 S = "${WORKDIR}/git"
 
-inherit distutils allarch python-dir systemd update-rc.d
+inherit distutils python-dir systemd update-rc.d
 
 export prefix = "${localstatedir}/lib"
 
Signature · 1 line
1.8.4.3
#6 lore raw

PATCH 7/11 mime-support: Drop allarch

In reply to Martin Jansa

* depends on TUNE_PKGARCH 'file'

---
 meta-oe/recipes-support/mime-support/mime-support_3.48.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-support/mime-support/mime-support_3.48.bb +0 -1
index e730102..db481e3 100644
@@ -10,7 +10,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += " ${libdir}/mime"
-inherit allarch
 
 docdir_append = "/${PN}"
 
Signature · 1 line
1.8.4.3
#7 lore raw

PATCH 8/11 usb-modeswitch-data: Drop allarch

In reply to Martin Jansa

* has runtime dependency on TUNE_PKGARCH usb-modeswitch
Hash for dependent task usb-modeswitch_1.2.5.bb.do_packagedata changed from 5709ee415d286847b58e7b438b5b9f75 to fbef5eee3bb2bacb805a0bead2095b52

---
 meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb +0 -2
index fc0fbfb..8b71618 100644
@@ -2,8 +2,6 @@ DESCRIPTION = "Data files for usbmodeswitch"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-inherit allarch
-
 SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2"
 SRC_URI[md5sum] = "91feff51deba6e48e78506b8f4db2274"
 SRC_URI[sha256sum] = "a3114e2c1f38eed3ad0067df30e53a96313908a9539a8ea5d94a4d35651699eb"
Signature · 1 line
1.8.4.3
#8 lore raw

PATCH 9/11 zram: Drop allarch

In reply to Martin Jansa

* runtime dependencies are TUNE_PKGARCH causing do_package_write_* task to have different signature for MACHINEs with different TUNE_PKGARCH
* move kernel-module-zram to RRECOMMENDS, because signature handler is excluding kernel-module-* dependencies only from RRECOMMENDS and also because some machine can have zram enabled in kernel and kernel-module-zram won't exist.

---
 meta-oe/recipes-extended/zram/zram_0.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/zram/zram_0.1.bb +3 -2
index fbeb586..02abb12 100644
@@ -2,9 +2,10 @@ DESCRIPTION = "Linux zram compressed in-memory swap"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-inherit allarch update-rc.d systemd
+inherit update-rc.d systemd
 
-RDEPENDS_${PN} = "util-linux-swaponoff kmod kernel-module-zram"
+RDEPENDS_${PN} = "util-linux-swaponoff kmod"
+RRECOMMENDS_${PN} = "kernel-module-zram"
 
 PR = "r3"
 
Signature · 1 line
1.8.4.3
#9 lore raw

PATCH 10/11 fbset-modes: Explicitly set MACHINE_ARCH

In reply to Martin Jansa

* bitbake-diffsigs output:
basehash changed from 2f6aa4302713441e9c3c7207c4edea33 to 3486f2b65998ee4ec5bd5fbbe02cadb0
List of dependencies for variable TARGET_LD_ARCH changed from 'set([])' to 'set(['TUNE_LDARGS'])'
List of dependencies for variable TARGET_AS_ARCH changed from 'set([])' to 'set(['TUNE_ASARGS'])'
List of dependencies for variable TARGET_OS changed from 'set([])' to 'set(['ABIEXTENSION', 'LIBCEXTENSION'])' List of dependencies for variable TARGET_CC_ARCH changed from 'set([])' to 'set(['TUNE_CCARGS'])'
List of dependencies for variable TARGET_ARCH changed from 'set([])' to 'set(['TUNE_ARCH'])'
Dependency on Variable ABIEXTENSION was removed
Dependency on Variable TUNE_CCARGS was removed
Dependency on Variable TUNE_FEATURES_tune-armv5t was removed
Dependency on Variable TUNE_FEATURES_tune-armv5te was removed
Dependency on Variable TUNE_ARCH was removed
Dependency on Variable LIBCEXTENSION was removed
Dependency on Variable TUNE_FEATURES_tune-armv5 was removed
Dependency on Variable TUNE_LDARGS was removed
Dependency on Variable DEFAULTTUNE was removed
Dependency on Variable TUNE_ASARGS was removed
Dependency on Variable TUNE_FEATURES was removed
Variable TARGET_LD_ARCH value changed from 'none' to '${TUNE_LDARGS}'
Variable TARGET_AS_ARCH value changed from 'none' to '${TUNE_ASARGS}'
Variable TARGET_OS value changed from 'linux' to 'linux${LIBCEXTENSION}${ABIEXTENSION}'
Variable TARGET_CC_ARCH value changed from 'none' to '${TUNE_CCARGS}'
Variable TARGET_ARCH value changed from 'allarch' to '${TUNE_ARCH}'
Hash for dependent task fbset-modes.bb.do_patch changed from eb8e475b55d64d5c9f6427a90e080ba6 to ee7e89fdd852378ee18ac23cdd92f3d3

---
 meta-oe/recipes-support/fbset/fbset-modes.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-support/fbset/fbset-modes.bb +5 -1
index 03d4039..e3b26ec 100644
@@ -13,5 +13,9 @@ do_install() {
 }
 
 inherit allarch
-CONFFILES_${PN} = "${sysconfdir}/fb.modes"
 
+# fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass
+# to disable "all" behavior (found when comparing qemuarm and qemux86 signatures)
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CONFFILES_${PN} = "${sysconfdir}/fb.modes"
Signature · 1 line
1.8.4.3
#10 lore raw

PATCH 11/11 sound-theme-freedesktop: Don't set PACKAGE_ARCH

In reply to Martin Jansa

* either fix build to prevent trying to access compiler or don't set
PACKAGE_ARCH, signature is different for different MACHINEs
e.g.
List of dependencies for variable TUNE_ARCH changed from 'set(['X86ARCH32', 'X86ARCH64'])' to 'set([])'
Hash for dependent task gettext_0.18.3.1.bb.do_populate_sysroot changed from 915bae004926e982f835d12f511a5f2b to 24c8263bb82124c9000fff3eab16d293

---
 meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb | 3 ---
 1 file changed, 3 deletions(-)
meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb +0 -3
index 97a1dba..446cdfa 100644
@@ -5,9 +5,6 @@ LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69"
 
 inherit autotools gettext
 
-# with allarch.bbclass configure fails fo no compiler found
-PACKAGE_ARCH = "all"
-
 SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
 SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
Signature · 1 line
1.8.4.3