[Buildroot] [PATCH 2/2] package/systemd: Respect BR2_TARGET_GENERIC_GETTY_BAUDRATE

[Martin Bark]

Cyril, All,

Some comment inline below

On 29 October 2015 at 06:17, Cyril Bur <cyrilbur at gmail.com> wrote:
> On Thu, 29 Oct 2015 17:11:42 +1100
> Cyril Bur <cyrilbur at gmail.com> wrote:
>
>> Currently systemd getty services ignore baudrates set in buildroot in
>> favour of a hardcoded 115200. This patch SEDs out that hardcoded value with
>> what is selected.
>
> Signed-off-by: Cyril Bur <cyrilbur at gmail.com>
>
>> ---
>>  package/systemd/systemd.mk | 9 +++++++--
>>  1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
>> index b62fc08..d8a25ed 100644
>> --- a/package/systemd/systemd.mk
>> +++ b/package/systemd/systemd.mk
>> @@ -183,6 +183,7 @@ endef
>>
>>  ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),)
>>  # systemd needs getty.service for VTs and serial-getty.service for serial ttys
>> +# also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that
>>  define SYSTEMD_INSTALL_SERVICE_TTY
>>       if echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \
>>       then \
>> @@ -190,8 +191,12 @@ define SYSTEMD_INSTALL_SERVICE_TTY
>>       else \
>>               SERVICE="serial-getty"; \
>>       fi; \
>> -     ln -fs ../../../../lib/systemd/system/$${SERVICE}@.service \
>> -             $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${SERVICE}@$(BR2_TARGET_GENERIC_GETTY_PORT).service
>> +     ln -fs $(TARGET_DIR)/lib/systemd/system/$${SERVICE}@.service \
>> +             $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${SERVICE}@$(BR2_TARGET_GENERIC_GETTY_PORT).service; \

Changing the symlink above is not necessary for this patch.  Also i
think the the change is wrong and will cause the service to symlink an
invalid file when run on the target.

>> +     if [ $(BR2_TARGET_GENERIC_GETTY_BAUDRATE) -gt 0 ] ; \
>> +     then \
>> +             $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${SERVICE}@.service; \
>> +     fi

$(BR2_TARGET_GENERIC_GETTY_BAUDRATE) will have double quotes around it
which will need to be removed so i don't think the -gt test will ever
work.  Have a look in package/skeleton/skeleton.mk where it uses
$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) to strip the
double quotes before it uses the value, you'll need to do something
similar.

Thanks

Martin

>>  endef
>>  endif
>>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot