Skip to contentSkip to conversation

base-files: drop legacy empty file /etc/default/usbd

PATCH In review Andre McCurdy 3 participants 13 messages Sep 16, 2019 – Sep 17, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 base-files: drop legacy empty file /etc/default/usbd

Doesn't seem to be referenced by anything in oe-core any more.

---
 meta/recipes-core/base-files/base-files/usbd      | 0
 meta/recipes-core/base-files/base-files_3.0.14.bb | 2 --
 2 files changed, 2 deletions(-)
 delete mode 100644 meta/recipes-core/base-files/base-files/usbd
meta/recipes-core/base-files/base-files/usbd deleted +0 -0
deleted file mode 100644
index e69de29bb2..0000000000
meta/recipes-core/base-files/base-files_3.0.14.bb +0 -2
index 2b1f217ddb..94299431f6 100644
@@ -20,7 +20,6 @@ SRC_URI = "file://rotation \
            file://fstab \
            file://issue.net \
            file://issue \
-           file://usbd \
            file://share/dot.bashrc \
            file://share/dot.profile \
            file://licenses/GPL-2 \
@@ -122,7 +121,6 @@ do_install () {
 	fi
 
 	install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
-	install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
 	install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
 	sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile
         sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/8 busybox: rcS and rcK should not be writeable by everyone

---
 meta/recipes-core/busybox/busybox.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/busybox/busybox.inc +2 -2
index 49165d7f51..4c3969501a 100644
@@ -316,8 +316,8 @@ do_install () {
 		fi
 	fi
 	if grep -q "CONFIG_INIT=y" ${B}/.config; then
-		install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
-		install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
+		install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
+		install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
 	fi
 
 	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
Signature · 1 line
2.23.0
#2 lore raw

PATCH 3/8 ffmpeg: add PACKAGECONFIG controls for alsa and zlib (enable by default)

In reply to Andre McCurdy

Also move the libogg dependency to the theora PACKAGECONFIG, since according to the configure script, theora is the specific component which requires it.

---
 meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +5 -3
index 2d69d8bd72..307e37e3fe 100644
@@ -38,12 +38,12 @@ ARM_INSTRUCTION_SET_armv6 = "arm"
 # libpostproc was previously packaged from a separate recipe
 PROVIDES = "libav libpostproc"
 
-DEPENDS = "alsa-lib zlib libogg nasm-native"
+DEPENDS = "nasm-native"
 
 inherit autotools pkgconfig
 
 PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
-                   bzlib gpl lzma theora x264 \
+                   alsa bzlib gpl lzma theora x264 zlib \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
 
 # libraries to build in addition to avutil
@@ -57,6 +57,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
 PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
 
 # features to support
+PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
 PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2"
 PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
 PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
@@ -68,13 +69,14 @@ PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
 PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
 PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
-PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
+PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg"
 PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
 PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
 PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
 PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
 PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb"
 PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
+PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
 
 # Check codecs that require --enable-nonfree
 USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}"
Signature · 1 line
2.23.0
#3 lore raw

PATCH 4/8 ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

In reply to Andre McCurdy
---
 meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +10 -1
index 307e37e3fe..c4261248b6 100644
@@ -114,10 +114,19 @@ EXTRA_OECONF = " \
     --pkg-config=pkg-config \
 "
 
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+    ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+    ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \
+"
+EXTRA_OECONF_append_arm = " ${EXTRA_OECONF_ARM}"
+EXTRA_OECONF_append_armeb = " ${EXTRA_OECONF_ARM}"
+
 EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"
+
 # gold crashes on x86, another solution is to --disable-asm but thats more hacky
 # ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
-
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
 do_configure() {
Signature · 1 line
2.23.0
#4 lore raw

Re: [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

This seems like something that could do with a ‘why’ in the commit message and/or comments, to me.

Quoted 38 lines · On Sep 16, 2019, 12:25 PM -0700, Andre McCurdy <[email protected]>, wrote:

---
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 11 ++++++++++-

1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +0 -1
index 307e37e3fe..c4261248b6 100644
@@ -114,10 +114,19 @@ EXTRA_OECONF = " \
--pkg-config=pkg-config \

"

meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +9 -0
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+ ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+ ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \
+"
+EXTRA_OECONF_append_arm = " ${EXTRA_OECONF_ARM}"
+EXTRA_OECONF_append_armeb = " ${EXTRA_OECONF_ARM}"
+

EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" +

# gold crashes on x86, another solution is to --disable-asm but thats more hacky
# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
-
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

do_configure() {
--
2.23.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw

Re: [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

Quoted 2 lines · Christopher Larson

This seems like something that could do with a ‘why’ in the commit message and/or comments, to me.

To be consistent with:

https://git.openembedded.org/openembedded-core/commit/?id=1a563214caf6bd5b3a026ebe953f8c692ebd640a

Quoted 40 lines · On Sep 16, 2019, 12:25 PM -0700, Andre McCurdy <[email protected]>, wrote:

---
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 11 ++++++++++-

1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +0 -1
index 307e37e3fe..c4261248b6 100644
@@ -114,10 +114,19 @@ EXTRA_OECONF = " \
--pkg-config=pkg-config \

"

meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +9 -0
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+ ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+ ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \
+"
+EXTRA_OECONF_append_arm = " ${EXTRA_OECONF_ARM}"
+EXTRA_OECONF_append_armeb = " ${EXTRA_OECONF_ARM}"
+

EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" +

# gold crashes on x86, another solution is to --disable-asm but thats more hacky
# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
-
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

do_configure() {
--
2.23.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw

Re: [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

Quoted 8 lines · Andre McCurdy
Quoted 2 lines · Christopher Larson

This seems like something that could do with a ‘why’ in the commit message and/or comments, to me.

To be consistent with:

https://git.openembedded.org/openembedded-core/commit/?id=1a563214caf6bd5b3a026ebe953f8c692ebd640a
...

libwebp sets -mfpu=neon when autodetecting,
is there a similar problem with ffmpeg?

Quoted 6 lines
Quoted 5 lines
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +5 -0
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+ ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+ ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \

...

If we cannot trust the vfp autodetection, why can we trust that the autodetection of the vfp variant (vfpv2, vfpv3 or vfpv3-d16) and the exact architecture (e.g. armv5te, armv6, armv6k or armv6t2) are correct?

Which brings us back to the problem what the actual problem is (if any).

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#7 lore raw

Re: [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

Quoted 21 lines · Adrian Bunk
Quoted 8 lines · Andre McCurdy
Quoted 2 lines · Christopher Larson

This seems like something that could do with a ‘why’ in the commit message and/or comments, to me.

To be consistent with:

https://git.openembedded.org/openembedded-core/commit/?id=1a563214caf6bd5b3a026ebe953f8c692ebd640a
...

libwebp sets -mfpu=neon when autodetecting,
is there a similar problem with ffmpeg?

Quoted 6 lines
Quoted 5 lines
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +5 -0
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+ ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+ ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \

...

Quoted 4 lines

If we cannot trust the vfp autodetection, why can we trust that the autodetection of the vfp variant (vfpv2, vfpv3 or vfpv3-d16) and the exact architecture (e.g. armv5te, armv6, armv6k or armv6t2) are correct?

In general we can't. However these are all corner cases which are rarely (if ever) tested.

For ffmpeg configuring with --enable-runtime-cpudetect (which I think we effectively do by default) probably hides a lot of the configure time misdetection too.

Quoted 1 line

Which brings us back to the problem what the actual problem is (if any).

I built for target without VFP or NEON and saw both as being enabled according to the configure log. Didn't investigate further than that.

Quoted 10 lines

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

#8 lore raw

Re: [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon

Quoted 27 lines · Andre McCurdy
Quoted 21 lines · Adrian Bunk
Quoted 8 lines · Andre McCurdy
Quoted 2 lines · Christopher Larson

This seems like something that could do with a ‘why’ in the commit message and/or comments, to me.

To be consistent with:

https://git.openembedded.org/openembedded-core/commit/?id=1a563214caf6bd5b3a026ebe953f8c692ebd640a
...

libwebp sets -mfpu=neon when autodetecting,
is there a similar problem with ffmpeg?

Quoted 6 lines
Quoted 5 lines
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +5 -0
+# Do not trust configure to determine if ARM vfp or neon are available.
+#
+EXTRA_OECONF_ARM = " \
+ ${@bb.utils.contains('TUNE_FEATURES','vfp','--enable-vfp','--disable-vfp', d)} \
+ ${@bb.utils.contains("TUNE_FEATURES",'neon','--enable-neon','--disable-neon',d)} \

...

Quoted 4 lines

If we cannot trust the vfp autodetection, why can we trust that the autodetection of the vfp variant (vfpv2, vfpv3 or vfpv3-d16) and the exact architecture (e.g. armv5te, armv6, armv6k or armv6t2) are correct?

Quoted 7 lines

In general we can't. However these are all corner cases which are rarely (if ever) tested.

For ffmpeg configuring with --enable-runtime-cpudetect (which I think we effectively do by default) probably hides a lot of the configure time misdetection too.
...

Building with --disable-runtime-cpudetect for qemuarmv5 gives:

ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     no
ARMv5TE enabled           yes
ARMv6 enabled             yes
ARMv6T2 enabled           yes
VFP enabled               yes
NEON enabled              yes

These 4 misdetections are all affecting a certain range of CPUs, ARMv6T2 misdetection should affect more CPUs than VFP misdetection.

There likely is a common root cause that should be fixed, instead of manually specifying every autodetected feature.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#9 lore raw

PATCH 5/8 ffmpeg: enable more verbose build logs

In reply to Andre McCurdy
---
 meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +2 -0
index c4261248b6..2809f343b8 100644
@@ -129,6 +129,8 @@ EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"
 # ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
+EXTRA_OEMAKE = "V=1"
+
 do_configure() {
     ${S}/configure ${EXTRA_OECONF}
 }
Signature · 1 line
2.23.0
#10 lore raw

PATCH 6/8 libwebp: apply ARM specific config options to big endian ARM

In reply to Andre McCurdy
---
 meta/recipes-multimedia/webp/libwebp_1.0.3.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-multimedia/webp/libwebp_1.0.3.bb +4 -1
index 01fc02d23b..a4d1ae43d9 100644
@@ -25,11 +25,14 @@ EXTRA_OECONF = " \
     --enable-libwebpdemux \
     --enable-threading \
 "
+
 # Do not trust configure to determine if neon is available.
 #
-EXTRA_OECONF_append_arm = " \
+EXTRA_OECONF_ARM = " \
     ${@bb.utils.contains("TUNE_FEATURES","neon","--enable-neon","--disable-neon",d)} \
 "
+EXTRA_OECONF_append_arm = " ${EXTRA_OECONF_ARM}"
+EXTRA_OECONF_append_armeb = " ${EXTRA_OECONF_ARM}"
 
 inherit autotools lib_package
 
Signature · 1 line
2.23.0
#11 lore raw

PATCH 7/8 initscripts: enable alignment.sh init script for big endian ARM

In reply to Andre McCurdy
---
 .../initscripts/initscripts-1.0/{arm => }/alignment.sh           | 0
 meta/recipes-core/initscripts/initscripts_1.0.bb                 | 1 +
 2 files changed, 1 insertion(+)
 rename meta/recipes-core/initscripts/initscripts-1.0/{arm => }/alignment.sh (100%)
meta/recipes-core/initscripts/initscripts-1.0/alignment.sh renamed from meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh +0 -0
similarity index 100%
rename from meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
rename to meta/recipes-core/initscripts/initscripts-1.0/alignment.sh
meta/recipes-core/initscripts/initscripts_1.0.bb +1 -0
index 91eea4b8c2..1a59b82fbf 100644
@@ -40,6 +40,7 @@ SRC_URI = "file://functions \
 S = "${WORKDIR}"
 
 SRC_URI_append_arm = " file://alignment.sh"
+SRC_URI_append_armeb = " file://alignment.sh"
 
 KERNEL_VERSION = ""
 
Signature · 1 line
2.23.0
#12 lore raw

PATCH 8/8 libunwind: apply configure over-ride to both big and little endian ARM

In reply to Andre McCurdy
---
 meta/recipes-support/libunwind/libunwind.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/libunwind/libunwind.inc +1 -0
index 5726589661..76a1bf6246 100644
@@ -12,6 +12,7 @@ PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz"
 PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native"
 
 EXTRA_OECONF_arm = "--enable-debug-frame"
+EXTRA_OECONF_armeb = "--enable-debug-frame"
 EXTRA_OECONF_aarch64 = "--enable-debug-frame"
 
 do_install_append () {
Signature · 1 line
2.23.0