libsndfile1: make sqlite and FLAC/Vorbis optional
PATCH 1/3 libsndfile1: make sqlite and FLAC/Vorbis optional
From: Max Kellermann <[email protected]>
Signed-off-by Max Kellermann <[email protected]>
--- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +4 -2
@@ -1,7 +1,7 @@ SUMMARY = "Audio format Conversion library" HOMEPAGE = "http://www.mega-nerd.com/libsndfile" AUTHOR = "Erik de Castro Lopo" -DEPENDS = "flac libogg libvorbis sqlite3" +DEPENDS = "" SECTION = "libs/multimedia" LICENSE = "LGPLv2.1"
@@ -27,8 +27,10 @@ CVE_PRODUCT = "libsndfile" S = "${WORKDIR}/libsndfile-${PV}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)} sqlite external-libs" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[sqlite] = ",--disable-sqlite,sqlite3" +PACKAGECONFIG[external-libs] = ",--disable-external-libs,flac libogg libvorbis" inherit autotools lib_package pkgconfig
Signature · 1 line
2.20.1
PATCH 2/3 useradd-staticids: print exception after parse_args() error
From: Max Kellermann <[email protected]>
Without this, the user has no idea what went wrong.
Signed-off-by Max Kellermann <[email protected]>
--- meta/classes/useradd-staticids.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/useradd-staticids.bbclass +4 -4
@@ -76,8 +76,8 @@ def update_useradd_static_config(d): for param in oe.useradd.split_commands(params): try: uaargs = parser.parse_args(oe.useradd.split_args(param)) - except: - bb.fatal("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN'), pkg, param)) + except Exception as e: + bb.fatal("%s: Unable to parse arguments for USERADD_PARAM_%s '%s': %s" % (d.getVar('PN'), pkg, param, e)) # Read all passwd files specified in USERADD_UID_TABLES or files/passwd # Use the standard passwd layout:
@@ -197,8 +197,8 @@ def update_useradd_static_config(d): try: # If we're processing multiple lines, we could have left over values here... gaargs = parser.parse_args(oe.useradd.split_args(param)) - except: - bb.fatal("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN'), pkg, param)) + except Exception as e: + bb.fatal("%s: Unable to parse arguments for GROUPADD_PARAM_%s '%s': %s" % (d.getVar('PN'), pkg, param, e)) # Read all group files specified in USERADD_GID_TABLES or files/group # Use the standard group layout:
Signature · 1 line
2.20.1
PATCH 3/3 initrdscripts: merge multiple "mkdir" calls
In reply to Max KellermannFrom: Max Kellermann <[email protected]>
Reduce overhead.
Signed-off-by Max Kellermann <[email protected]>
--- meta/recipes-core/initrdscripts/files/init-live.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) mode change 100644 => 100755 meta/recipes-core/initrdscripts/files/init-live.sh
meta/recipes-core/initrdscripts/files/init-live.sh +1 -5
@@ -28,8 +28,7 @@ udev_daemon() { _UDEV_DAEMON=`udev_daemon` early_setup() { - mkdir -p /proc - mkdir -p /sys + mkdir -p /proc /sys /run /var/run mount -t proc proc /proc mount -t sysfs sysfs /sys mount -t devtmpfs none /dev
@@ -37,9 +36,6 @@ early_setup() { # support modular kernel modprobe isofs 2> /dev/null - mkdir -p /run - mkdir -p /var/run - $_UDEV_DAEMON --daemon udevadm trigger --action=add }
Signature · 1 line
2.20.1
meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb CVE_PRODUCT = "libsndfile" · line 33
Quoted 2 lines · Max Kellermann
meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +2
-0+PACKAGECONFIG[sqlite] = ",--disable-sqlite,sqlite3" +PACKAGECONFIG[external-libs] = ",--disable-external-libs,flac libogg libvorbis"
Always be explicit and pass --enable-sqlite --eanble-external-libs too.
Rss