From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: s-ol <s+removethis@s-ol.nu>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/usb_modeswitch: fix installation of systemd unit file
Date: Sat, 14 May 2022 15:14:42 +0200 [thread overview]
Message-ID: <20220514131442.GY1597494@scaer> (raw)
In-Reply-To: <20220514124208.44912-1-s+removethis@s-ol.nu>
s-ol, All,
On 2022-05-14 14:42 +0200, s-ol via buildroot spake thusly:
> 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: s-ol <s+removethis@s-ol.nu>
We'll need that you use you real name to sign-off your changes.
> ---
> .../usb_modeswitch/0001-fix-systemd-detection.patch | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
> create mode 100644 package/usb_modeswitch/0001-fix-systemd-detection.patch
>
> diff --git a/package/usb_modeswitch/0001-fix-systemd-detection.patch b/package/usb_modeswitch/0001-fix-systemd-detection.patch
> new file mode 100644
> index 0000000000..6d02c648eb
> --- /dev/null
> +++ b/package/usb_modeswitch/0001-fix-systemd-detection.patch
The patch itself should contain a commit log of its own, and must be
signed off too.
> @@ -0,0 +1,13 @@
> +diff --git a/Makefile b/Makefile
> +index 22bd0e0..72321a4 100755
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -62,7 +62,7 @@
> + install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
> + install -d $(DESTDIR)/var/lib/usb_modeswitch
> + test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
> +- test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
> ++ test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl -o -e $(PREFIX)/bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
This is not very clean, but this is in line with how the rest of the
Makefile is written, so this is OK for me.
Can you please resubmit using your your real name, please?
Regards,
Yann E. MORIN.
> +
> + install: install-script
> +
> --
> 2.36.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-05-14 13:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-14 12:42 [Buildroot] [PATCH 1/1] package/usb_modeswitch: fix installation of systemd unit file s-ol via buildroot
2022-05-14 13:14 ` Yann E. MORIN [this message]
2022-05-14 14:26 ` [Buildroot] [PATCH v2 " Sol Bekic via buildroot
2022-05-14 21:53 ` Yann E. MORIN
2022-05-29 8:20 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220514131442.GY1597494@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=s+removethis@s-ol.nu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.