code.ossystems Code Review - openembedded-core.git/blob

   1 From 5547316c85cd45c0ea29c4c7c48eecd616783cd5 Mon Sep 17 00:00:00 2001
   2 From: Pino Toscano <toscano.pino@tiscali.it>
   3 Date: Tue, 17 Nov 2020 11:27:48 +0100
   4 Subject: [PATCH] build-sys: do not build plymouth-ctrl.c w/ disabled plymouth
   5
   6 Do not build plymouth-ctrl.c in agetty and sulogin in case the plymouth
   7 support is disabled.
   8
   9 Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/5547316c85cd45c0ea29c4c7c48eecd616783cd5]
  10 Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
  11 ---
  12  login-utils/Makemodule.am | 6 ++++--
  13  term-utils/Makemodule.am  | 6 ++++--
  14  2 files changed, 8 insertions(+), 4 deletions(-)
  15
  16 diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
  17 index 4f52cea3c..8bc3ee37e 100644
  18 --- a/login-utils/Makemodule.am
  19 +++ b/login-utils/Makemodule.am
  20 @@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8
  21  sulogin_SOURCES = \
  22         login-utils/sulogin.c \
  23         login-utils/sulogin-consoles.c \
  24 -       login-utils/sulogin-consoles.h \
  25 -       lib/plymouth-ctrl.c
  26 +       login-utils/sulogin-consoles.h
  27 +if USE_PLYMOUTH_SUPPORT
  28 +sulogin_SOURCES += lib/plymouth-ctrl.c
  29 +endif
  30  sulogin_LDADD = $(LDADD) libcommon.la
  31
  32  if HAVE_LIBCRYPT
  33 diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
  34 index 92df7dbc8..c424dbdf8 100644
  35 --- a/term-utils/Makemodule.am
  36 +++ b/term-utils/Makemodule.am
  37 @@ -42,8 +42,10 @@ endif # BUILD_SCRIPTLIVE
  38  if BUILD_AGETTY
  39  sbin_PROGRAMS += agetty
  40  dist_man_MANS += term-utils/agetty.8
  41 -agetty_SOURCES = term-utils/agetty.c \
  42 -                lib/plymouth-ctrl.c
  43 +agetty_SOURCES = term-utils/agetty.c
  44 +if USE_PLYMOUTH_SUPPORT
  45 +agetty_SOURCES += lib/plymouth-ctrl.c
  46 +endif
  47  agetty_LDADD = $(LDADD) libcommon.la
  48  if BSD
  49  agetty_LDADD += -lutil
  50 --
  51 2.29.2
  52