patches/sysvinit/sysvinit-2.90-dragora_consolidated-1.patch

   1 --- src/Makefile.orig   2018-06-18 20:25:26.000000000 -0300
   2 +++ src/Makefile        2018-06-20 18:06:52.530112234 -0300
   3 @@ -9,8 +9,8 @@
   4  #
   5
   6  CPPFLAGS =
   7 -CFLAGS ?= -ansi -O2 -fomit-frame-pointer -fstack-protector-strong
   8 -override CFLAGS += -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE
   9 +CFLAGS ?= -O2
  10 +override CFLAGS += -ansi -fomit-frame-pointer -fstack-protector-strong -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE
  11  override CFLAGS += $(shell getconf LFS_CFLAGS)
  12  STATIC =
  13  MANDB  := s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@
  14 @@ -24,18 +24,18 @@
  15  # For some known distributions we do not build all programs, otherwise we do.
  16  BIN    =
  17  SBIN   = init halt shutdown runlevel killall5 fstab-decode
  18 -USRBIN = last mesg
  19 +#USRBIN        = last mesg
  20
  21 -MAN1   = last.1 lastb.1 mesg.1
  22 +#MAN1  = last.1 lastb.1 mesg.1
  23  MAN5   = initscript.5 inittab.5 initctl.5
  24 -MAN8   = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
  25 +MAN8   = halt.8 init.8 killall5.8 poweroff.8 reboot.8 runlevel.8
  26  MAN8   += shutdown.8 telinit.8 fstab-decode.8
  27
  28  ifeq ($(DISTRO),)
  29 -SBIN   += sulogin bootlogd
  30 -USRBIN += utmpdump wall
  31 -MAN1   += utmpdump.1 wall.1
  32 -MAN8   += sulogin.8 bootlogd.8
  33 +#SBIN  += sulogin bootlogd
  34 +#USRBIN        += utmpdump wall
  35 +#MAN1  += utmpdump.1 wall.1
  36 +#MAN8  += sulogin.8 bootlogd.8
  37  endif
  38
  39  ifeq ($(DISTRO),Debian)
  40 @@ -90,14 +90,14 @@
  41  endif
  42
  43  # Additional libs for GNU libc.
  44 -ifneq ($(wildcard /usr/lib*/libcrypt.*),)
  45 -  SULOGINLIBS  += -lcrypt
  46 -endif
  47 +#ifneq ($(wildcard /usr/lib*/libcrypt.*),)
  48 +#  SULOGINLIBS += -lcrypt
  49 +#endif
  50
  51  # Additional libs for GNU libc / multiarch on Debian based systems.
  52 -ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
  53 -  SULOGINLIBS  += -lcrypt
  54 -endif
  55 +#ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
  56 +#  SULOGINLIBS += -lcrypt
  57 +#endif
  58
  59  all:           $(BIN) $(SBIN) $(USRBIN)
  60
  61 @@ -192,10 +192,10 @@
  62                 ln -sf halt $(ROOT)/sbin/reboot
  63                 ln -sf halt $(ROOT)/sbin/poweroff
  64                 ln -sf init $(ROOT)/sbin/telinit
  65 -               ln -sf /sbin/killall5 $(ROOT)/bin/pidof
  66 -               if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
  67 -                       ln -sf last $(ROOT)/usr/bin/lastb; \
  68 -               fi
  69 +               #ln -sf /sbin/killall5 $(ROOT)/bin/pidof
  70 +               #if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
  71 +               #       ln -sf last $(ROOT)/usr/bin/lastb; \
  72 +               #fi
  73                 $(INSTALL_DIR) $(ROOT)/usr/include/
  74                 $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
  75                 $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
  76 @@ -217,8 +217,8 @@
  77                 #
  78                 # This part is skipped on Debian systems, the
  79                 # debian.preinst script takes care of it.
  80 -               @if [ ! -p /run/initctl ]; then \
  81 -                echo "Creating /run/initctl"; \
  82 -                rm -f /run/initctl; \
  83 -                mknod -m 600 /run/initctl p; fi
  84 +               #@if [ ! -p /run/initctl ]; then \
  85 +               # echo "Creating /run/initctl"; \
  86 +               # rm -f /run/initctl; \
  87 +               # mknod -m 600 /run/initctl p; fi
  88  endif