| Message ID | 27279_1663677903_6329B5CF_27279_384_1_a0ff8f4ff44501c533f2779965524fc93294a825.1663677504.git.yann.morin@orange.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/gpsd: drop legacy cleanup | expand |
Yann, All, On 2022-09-20 14:45 +0200, yann.morin@orange.com spake thusly: > From: "Yann E. MORIN" <yann.morin@orange.com> > > Since gpsd-3.22, the systemd service files no longer contain hard-coded > paths to /usr/local/, but use @SBINDIR@ which is replaced appropriately > at build time, and contains the correct path. > > Drop the legacy fixup now. > > Signed-off-by: Yann E. MORIN <yann.morin@orange.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Series of two patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gpsd/gpsd.mk | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk > index 0c7018f26d..b8526c0260 100644 > --- a/package/gpsd/gpsd.mk > +++ b/package/gpsd/gpsd.mk > @@ -213,14 +213,6 @@ define GPSD_INSTALL_INIT_SYSV > $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd > endef > > -# systemd unit files are installed automatically, but need to update the > -# /usr/local path references in the provided files to /usr. > -define GPSD_INSTALL_INIT_SYSTEMD > - $(SED) 's%/usr/local%/usr%' \ > - $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service \ > - $(TARGET_DIR)/usr/lib/systemd/system/gpsdctl@.service > -endef > - > define GPSD_INSTALL_STAGING_CMDS > (cd $(@D); \ > $(GPSD_SCONS_ENV) \ > -- > 2.25.1 > > > _________________________________________________________________________________________________________________________ > > Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc > pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler > a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, > Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. > > This message and its attachments may contain confidential or privileged information that may be protected by law; > they should not be distributed, used or copied without authorisation. > If you have received this email in error, please notify the sender and delete this message and its attachments. > As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. > Thank you. > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> <yann.morin@orange.com> writes: > From: "Yann E. MORIN" <yann.morin@orange.com> > Since gpsd-3.22, the systemd service files no longer contain hard-coded > paths to /usr/local/, but use @SBINDIR@ which is replaced appropriately > at build time, and contains the correct path. > Drop the legacy fixup now. > Signed-off-by: Yann E. MORIN <yann.morin@orange.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2022.08.x and 2022.02.x, thanks.
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 0c7018f26d..b8526c0260 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -213,14 +213,6 @@ define GPSD_INSTALL_INIT_SYSV $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd endef -# systemd unit files are installed automatically, but need to update the -# /usr/local path references in the provided files to /usr. -define GPSD_INSTALL_INIT_SYSTEMD - $(SED) 's%/usr/local%/usr%' \ - $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/gpsdctl@.service -endef - define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \