Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/systemd/systemd-239-r1.smage2

    Diff of /smage/trunk/core/systemd/systemd-239-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 12028 by niro, Mon Aug 20 13:46:21 2018 UTC revision 12029 by niro, Mon Aug 20 14:00:01 2018 UTC
    # Line 8  PBUILD="r1" Line 8  PBUILD="r1"
    8  # 0=disable dev split packages  # 0=disable dev split packages
    9  ENABLE_DEV_PACKAGES="1"  ENABLE_DEV_PACKAGES="1"
    10    
    11  SPLIT_PACKAGES="libsystemd-shared libudev udev nss-myhostname libsystemd systemd-coredump systemd systemd-tools"  SPLIT_PACKAGES="libsystemd-shared systemd-systemctl libudev udev nss-myhostname libsystemd systemd-coredump systemd systemd-tools"
    12    
    13  # dev packages  # dev packages
    14  if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]  if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    # Line 36  SPECIAL_VARS="SYSVINIT_SUPPORT BUSYBOX_S Line 36  SPECIAL_VARS="SYSVINIT_SUPPORT BUSYBOX_S
    36  # and this functions too  # and this functions too
    37  SPECIAL_FUNCTIONS="pkg_setup"  SPECIAL_FUNCTIONS="pkg_setup"
    38    
    39  GLIB2_DEPEND=">= dev-libs/glib2-2.54"  GLIB2_DEPEND=">= dev-libs/glib2-2.56"
    40  GLIBC_DEPEND=">= virtual/glibc"  GLIBC_DEPEND=">= virtual/glibc"
    41  LIBGCC_DEPEND=">= sys-libs/libgcc-6.3"  LIBGCC_DEPEND=">= sys-libs/libgcc-7.3"
    42  XZ_DEPEND=">= virtual/xz-utils"  XZ_DEPEND=">= virtual/xz-utils"
    43  LIBGCRYPT_DEPEND=">= app-crypt/libgcrypt-1.8"  LIBGCRYPT_DEPEND=">= app-crypt/libgcrypt-1.8"
    44  LIBGPGERROR_DEPEND=">= app-crypt/libgpg-error-1.27"  LIBGPGERROR_DEPEND=">= app-crypt/libgpg-error-1.31"
    45  LIBNOTIFY_DEPEND=">= x11-libs/libnotify-0.7"  LIBNOTIFY_DEPEND=">= x11-libs/libnotify-0.7"
    46  LIBGEE_DEPEND=">= dev-libs/libgee-0.20"  LIBGEE_DEPEND=">= dev-libs/libgee-0.20"
    47  LIBCAP_DEPEND=">= sys-libs/libcap-2.25"  LIBCAP_DEPEND=">= sys-libs/libcap-2.25"
    48  ELFUTILS_DEPEND=">= dev-libs/elfutils-libs-0.170"  ELFUTILS_DEPEND=">= dev-libs/elfutils-libs-0.170"
    49  LIBBLKID_DEPEND=">= sys-libs/libblkid-2.30"  LIBBLKID_DEPEND=">= sys-libs/libblkid-2.32"
    50  COMMON_DEPEND="${GLIBC_DEPEND}  COMMON_DEPEND="${GLIBC_DEPEND}
    51   ${LIBGCC_DEPEND}   ${LIBGCC_DEPEND}
    52   ${LIBCAP_DEPEND}"   ${LIBCAP_DEPEND}"
    # Line 54  COMMON_DEPEND="${GLIBC_DEPEND} Line 54  COMMON_DEPEND="${GLIBC_DEPEND}
    54  DAEMON_DEPEND="${COMMON_DEPEND}  DAEMON_DEPEND="${COMMON_DEPEND}
    55   ${GLIB2_DEPEND}   ${GLIB2_DEPEND}
    56   >= virtual/procps   >= virtual/procps
    57   >= sys-apps/util-linux-2.30   >= sys-apps/util-linux-2.32
    58   >= sys-apps/kmod-24"   >= sys-apps/kmod-25"
    59  COREDUMP_DEPEND="${COMMON_DEPEND}  COREDUMP_DEPEND="${COMMON_DEPEND}
    60   ${LIBGCRYPT_DEPEND}   ${LIBGCRYPT_DEPEND}
    61   ${LIBGPGERROR_DEPEND}   ${LIBGPGERROR_DEPEND}
    62   ${ELFUTILS_DEPEND}"   ${ELFUTILS_DEPEND}"
    63    SYSTEMCTL_DEPEND="${COMMON_DEPEND}"
    64    
    65  LIBUDEV_DEPEND="${COMMON_DEPEND}"  LIBUDEV_DEPEND="${COMMON_DEPEND}"
    66  NSS_DEPEND="${COMMON_DEPEND}  NSS_DEPEND="${COMMON_DEPEND}
    # Line 80  SYSTEMD_DEPEND="${DAEMON_DEPEND} Line 81  SYSTEMD_DEPEND="${DAEMON_DEPEND}
    81   ${LIBGPGERROR_DEPEND}   ${LIBGPGERROR_DEPEND}
    82   >= sys-apps/mage-release-1   >= sys-apps/mage-release-1
    83   >= sys-apps/dbus-1.10   >= sys-apps/dbus-1.10
    84   >= dev-libs/dbus-glib-0.108   >= dev-libs/dbus-glib-0.110
    85   >= virtual/shadow"   >= virtual/shadow"
    86    
    87  TOOLS_DEPEND=">= dev-python/python3-dbus-1.2  TOOLS_DEPEND=">= dev-python/python3-dbus-1.2
    88   >= sys-apps/polkit-0.113"   >= sys-apps/polkit-0.114"
    89    
    90  UDEV_DEPEND="${DAEMON_DEPEND}  UDEV_DEPEND="${DAEMON_DEPEND}
    91   >= dev-libs/libusb-compat-0.1.4   >= dev-libs/libusb-compat-0.1.4
    92   >= virtual/usbutils   >= virtual/usbutils
    93   >= virtual/pciutils   >= virtual/pciutils
    94   >= sys-libs/libuuid-2.30   >= sys-libs/libuuid-2.32
    95   >= sys-fs/libgudev-230"   >= sys-fs/libgudev-232"
    96    
    97  PYTHON_DEPEND=">= dev-lang/python3-3.6  PYTHON_DEPEND=">= dev-lang/python3-3.6
    98   >= dev-python/python3-lxml-3.5"   >= dev-python/python3-lxml-4.1"
    99    
    100  if [[ ${ENABLE_GTK} = 1 ]]  if [[ ${ENABLE_GTK} = 1 ]]
    101  then  then
    # Line 120  SDEPEND="${LIBUDEV_DEPEND} Line 121  SDEPEND="${LIBUDEV_DEPEND}
    121   ${NSS_DEPEND}   ${NSS_DEPEND}
    122   ${LIBSYSTEMD_DEPEND}   ${LIBSYSTEMD_DEPEND}
    123   ${LIBSYSTEMD_SHARED_DEPEND}   ${LIBSYSTEMD_SHARED_DEPEND}
    124     ${SYSTEMCTL_DEPEND}
    125   ${SYSTEMD_DEPEND}   ${SYSTEMD_DEPEND}
    126   ${TOOLS_DEPEND}   ${TOOLS_DEPEND}
    127   ${UDEV_DEPEND}   ${UDEV_DEPEND}
    # Line 129  SDEPEND="${LIBUDEV_DEPEND} Line 131  SDEPEND="${LIBUDEV_DEPEND}
    131   >= app-text/docbook-xml-dtd42-4.2   >= app-text/docbook-xml-dtd42-4.2
    132   >= app-text/docbook-xml-dtd45-4.5   >= app-text/docbook-xml-dtd45-4.5
    133   >= dev-libs/libcgroup-0.41   >= dev-libs/libcgroup-0.41
    134   >= dev-libs/libxslt-1.1.26   >= dev-libs/libxslt-1.1.32
    135   >= dev-lang/vala-0.38   >= dev-lang/vala-0.40
    136   >= dev-util/intltool-0.50   >= dev-util/intltool-0.51
    137   >= dev-util/gperf-3.1   >= dev-util/gperf-3.1
    138   >= virtual/kernel-headers   >= virtual/kernel-headers
    139   >= dev-libs/glib2-dev-2.42   >= dev-libs/glib2-dev-2.42
    # Line 175  SRC_URI+=( Line 177  SRC_URI+=(
    177   https://github.com/${PNAME}/${PNAME}/archive/${SRCFILE}   https://github.com/${PNAME}/${PNAME}/archive/${SRCFILE}
    178   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    179   mirror://udev/${UDEV_CONFIG_SRCFILE}   mirror://udev/${UDEV_CONFIG_SRCFILE}
    180   mirror://${PNAME}/${PNAME}-235-magellan-configurable-getty-2.patch   mirror://${PNAME}/${PNAME}-239-magellan-configurable-getty-2.patch
    181   mirror://${PNAME}/${PNAME}-234-getty-busybox-compat.patch   mirror://${PNAME}/${PNAME}-234-getty-busybox-compat.patch
    182   mirror://${PNAME}/${PNAME}-236-uucp-group.patch   mirror://${PNAME}/${PNAME}-236-uucp-group.patch
    183   mirror://${PNAME}/${PNAME}-233-systemd-user-pam.patch   mirror://${PNAME}/${PNAME}-233-systemd-user-pam.patch
    # Line 209  split_info_udev() Line 211  split_info_udev()
    211   DESCRIPTION="A Userspace Implementation for dynamic /dev nodes."   DESCRIPTION="A Userspace Implementation for dynamic /dev nodes."
    212   DEPEND="${UDEV_DEPEND}   DEPEND="${UDEV_DEPEND}
    213   == sys-fs/libudev-${PVER}   == sys-fs/libudev-${PVER}
    214   == sys-libs/libsystemd-shared-${PVER}"   == sys-libs/libsystemd-shared-${PVER}
    215     == sys-apps/systemd-systemctl-${PVER}"
    216   PCAT="sys-fs"   PCAT="sys-fs"
    217  }  }
    218    
    # Line 248  split_info_libsystemd-shared() Line 251  split_info_libsystemd-shared()
    251   PCAT="sys-libs"   PCAT="sys-libs"
    252  }  }
    253    
    254    split_info_systemd-systemctl()
    255    {
    256     DESCRIPTION="systemd services control utility."
    257     DEPEND="${SYSTEMCTL_DEPEND}
    258     == sys-libs/libsystemd-shared-${PVER}"
    259    }
    260    
    261  split_info_systemd-coredump()  split_info_systemd-coredump()
    262  {  {
    263   DESCRIPTION="systemd coredump utility."   DESCRIPTION="systemd coredump utility."
    # Line 262  split_info_systemd() Line 272  split_info_systemd()
    272   == sys-libs/libsystemd-${PVER}   == sys-libs/libsystemd-${PVER}
    273   == sys-libs/libsystemd-shared-${PVER}   == sys-libs/libsystemd-shared-${PVER}
    274   == net-dns/nss-myhostname-${PVER}   == net-dns/nss-myhostname-${PVER}
    275     == sys-apps/systemd-systemctl-${PVER}
    276   == sys-fs/udev-${PVER}"   == sys-fs/udev-${PVER}"
    277   # ignore with alx   # ignore with alx
    278   # == sys-apps/systemd-coredump-${PVER}   # == sys-apps/systemd-coredump-${PVER}
    # Line 322  then Line 333  then
    333  fi  fi
    334    
    335   # magellan-only: use a configurable getty   # magellan-only: use a configurable getty
    336   mpatch ${PNAME}-235-magellan-configurable-getty-2.patch || die   mpatch ${PNAME}-239-magellan-configurable-getty-2.patch || die
    337    
    338   # fix busybox compat, agetty options unknown   # fix busybox compat, agetty options unknown
    339   mpatch ${PNAME}-234-getty-busybox-compat.patch || die   mpatch ${PNAME}-234-getty-busybox-compat.patch || die
    # Line 454  fi Line 465  fi
    465   # remove files which are owned by other packages   # remove files which are owned by other packages
    466   mdelete /etc/systemd/coredump.conf || die   mdelete /etc/systemd/coredump.conf || die
    467   mdelete /usr/bin/coredumpctl || die   mdelete /usr/bin/coredumpctl || die
    468     mdelete /usr/bin/systemctl || die
    469   mdelete /usr/bin/systemd-analyze || die   mdelete /usr/bin/systemd-analyze || die
    470   mdelete /usr/bin/kernel-install || die   mdelete /usr/bin/kernel-install || die
    471   mdelete -r /etc/udev || die   mdelete -r /etc/udev || die
    # Line 481  fi Line 493  fi
    493   mdelete /usr/lib/pkgconfig/libudev.pc || die   mdelete /usr/lib/pkgconfig/libudev.pc || die
    494   fi   fi
    495   mdelete /usr/share/man/man1/coredumpctl.1 || die   mdelete /usr/share/man/man1/coredumpctl.1 || die
    496     mdelete /usr/share/man/man1/systemctl.1 || die
    497   mdelete /usr/share/man/man5/coredump.conf.5 || die   mdelete /usr/share/man/man5/coredump.conf.5 || die
    498   mdelete /usr/share/man/man5/coredump.conf.d.5 || die   mdelete /usr/share/man/man5/coredump.conf.d.5 || die
    499   mdelete /usr/share/man/man8/systemd-coredump.8 || die   mdelete /usr/share/man/man8/systemd-coredump.8 || die
    # Line 578  src_install_systemd-coredump() Line 591  src_install_systemd-coredump()
    591   || die   || die
    592  }  }
    593    
    594    src_install_systemd-systemctl()
    595    {
    596     DESTDIR=${BINDIR} mninja install || die
    597    
    598     zapmost ${BINDIR} \
    599     usr/bin/systemctl \
    600     usr/share/man/man1/systemctl.1 \
    601     || die
    602    }
    603    
    604  src_install_systemd-tools()  src_install_systemd-tools()
    605  {  {
    606   if [[ ${ENABLE_GTK} = 1 ]]   if [[ ${ENABLE_GTK} = 1 ]]
    Legend:
    Removed from v.12028  
    changed lines
      Added in v.12029