Skip to content

package/usb_modeswitch: fix installation of systemd unit file#2

Merged
agners merged 1 commit intohome-assistant:2022.02.x-haosfrom
s-ol:fix-usb_modeswitch-systemd
May 16, 2022
Merged

package/usb_modeswitch: fix installation of systemd unit file#2
agners merged 1 commit intohome-assistant:2022.02.x-haosfrom
s-ol:fix-usb_modeswitch-systemd

Conversation

@s-ol
Copy link
Contributor

@s-ol s-ol commented May 14, 2022

The upstream Makefile failed to detect systemd being present in some (maybe all)
builds, resulting in the unit file not being installed. Without the unit file,
the udev rules in usb_modeswitch-data don't work as expected (no modeswitch is
performed).

This is required to make home-assistant/operating-system#1899 plug-and-play.

I'll also send this patch to the buildroot mailing list.

The upstream Makefile failed to detect systemd being present in some (maybe all)
builds, resulting in the unit file not being installed. Without the unit file,
the udev rules in usb_modeswitch-data don't work as expected (no modeswitch is
performed).

This commit adds a patch that modifies the Makefile to include
'$(PREFIX)/bin/systemctl' in the list of paths checked, which makes the
installation phase work as intended. I will also submit this patch upstream.

Signed-off-by: Sol Bekic <s+removethis@s-ol.nu>
@s-ol s-ol force-pushed the fix-usb_modeswitch-systemd branch from 737fb52 to fae470a Compare May 14, 2022 15:10
@agners
Copy link
Member

agners commented May 16, 2022

Perfect, thanks, I see it already got applied upstream 🎉
https://lists.buildroot.org/pipermail/buildroot/2022-May/642727.html

@agners agners merged commit 6668684 into home-assistant:2022.02.x-haos May 16, 2022
@Taranoo2

This comment was marked as off-topic.

@agners
Copy link
Member

agners commented May 17, 2022

@Taranoo2 this is not a support forum. Please create a thread in the support forums and explain what you would like to do.

@s-ol
Copy link
Contributor Author

s-ol commented Jun 3, 2022

sairon pushed a commit that referenced this pull request Jun 10, 2024
Add s390x musl supported archs. Upstream musl already supports s390x[1].

Tested with qemu_s390s_defconfig:

	$ output/host/bin/qemu-system-s390x -M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 -kernel output/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" -display none -serial mon:stdio -net nic,model=virtio -net user
	(...)
	Welcome to Buildroot
	buildroot login: root
	# uname -a
	Linux buildroot 6.1.44 #2 SMP Sun Feb 18 01:33:42 CET 2024 s390x GNU/Linux
	# /lib/ld-musl-s390x.so.1
	musl libc (s390x)
	Version 1.2.4
	Dynamic Program Loader
	Usage: /lib/ld-musl-s390x.so.1 [options] [--] pathname [args]

[1]: https://git.musl-libc.org/cgit/musl/commit/?id=15094943050eb9a564f409323070e50b40f78816

Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ab990cf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
sairon pushed a commit that referenced this pull request Aug 21, 2024
Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.

Due to this change, exim fails to build with output:

    Applying 0004-exim_lock-fix-lstat-related-build-errors.patch using patch:
    patching file src/exim_lock.c
    Hunk #1 FAILED at 13.
    Hunk #2 succeeded at 27 (offset 1 line).
    1 out of 2 hunks FAILED -- saving rejects to file src/exim_lock.c.rej

This commit rebases the package patches on the current package version
when needed.

Fixes:
http://autobuild.buildroot.net/results/ff27d5ebd7f24ac8cb236b83c67c2c75255e51c6/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Yann E. MORIN <yann.morin@orange.com>
Tested-by: Yann E. MORIN <yann.morin@orange.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 2097314)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
sairon pushed a commit that referenced this pull request Jun 24, 2025
Add a patch that removes part of the logic that attempts to detect if
thumb is supported. This logic simply doesn't work at all in the
Buildroot context. In fact, thumb is supported on all 32-bit ARM on
which we can build qt5webengine.

Fixes:
WARNING: Thumb instruction set is required to build ffmpeg for QtWebEngine.
[...]
FAILED: obj/third_party/ffmpeg/ffmpeg_internal/vp8.o
[...] -c ../../3rdparty/chromium/third_party/ffmpeg/libavcodec/vp8.c -o obj/third_party/ffmpeg/ffmpeg_internal/vp8.o
{standard input}: Assembler messages:
{standard input}:1119: Error: bad instruction `ldrhcs r0,[ip],#2'
{standard input}:1156: Error: bad instruction `ldrhcs r9,[ip],#2'
{standard input}:1190: Error: bad instruction `ldrhcs lr,[ip],#2'
{standard input}:1253: Error: bad instruction `ldrhcs r9,[r7],#2'
[...]

Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
Cc: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 2b2120dc4a56c88314f8d94546c9a9120bb45527)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants