Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/networkmanager/networkmanager-1.20.4-r1.smage2

    Diff of /trunk/extras/networkmanager/networkmanager-1.20.4-r1.smage2

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

    revision 33277 by niro, Wed Oct 23 08:29:23 2019 UTC revision 33282 by niro, Thu Oct 24 09:25:34 2019 UTC
    # Line 4  PNAME="networkmanager" Line 4  PNAME="networkmanager"
    4  PVER="1.20.4"  PVER="1.20.4"
    5  PBUILD="r1"  PBUILD="r1"
    6    
    7  SPLIT_PACKAGES="libnm libnm-glib networkmanager networkmanager-adsl networkmanager-wwan networkmanager-bluetooth networkmanager-wifi networkmanager-ppp networkmanager-iscsi networkmanager-team networkmanager-tui"  SPLIT_PACKAGES="libnm networkmanager networkmanager-adsl networkmanager-wwan networkmanager-bluetooth networkmanager-wifi networkmanager-ppp networkmanager-iscsi networkmanager-team networkmanager-tui"
    8  # todo dnsmasq support  # todo dnsmasq support
    9    
    10  PCAT="net-misc"  PCAT="net-misc"
    # Line 20  LIBNM_DEPEND=">= dev-libs/glib2-2.62 Line 20  LIBNM_DEPEND=">= dev-libs/glib2-2.62
    20   >= dev-libs/nss-3.46   >= dev-libs/nss-3.46
    21   >= sys-libs/libuuid-2.34   >= sys-libs/libuuid-2.34
    22   >= dev-libs/jansson-2.12"   >= dev-libs/jansson-2.12"
     GLIB_DEPEND=">= sys-libs/dbus-libs-1.12  
      >= dev-libs/dbus-glib-0.110"  
    23  NM_DEPEND=">= sys-apps/dbus-1.12  NM_DEPEND=">= sys-apps/dbus-1.12
    24   >= sys-fs/udev-242   >= sys-fs/udev-242
    25   >= sys-apps/systemd-242   >= sys-apps/systemd-242
    # Line 47  TEAM_DEPEND=">= net-libs/libteam-1.29" Line 45  TEAM_DEPEND=">= net-libs/libteam-1.29"
    45  TUI_DEPEND=">= dev-libs/newt-0.52"  TUI_DEPEND=">= dev-libs/newt-0.52"
    46    
    47  SDEPEND="${LIBNM_DEPEND}  SDEPEND="${LIBNM_DEPEND}
      ${GLIB_DEPEND}  
    48   ${NM_DEPEND}   ${NM_DEPEND}
    49   ${ADSL_DEPEND}   ${ADSL_DEPEND}
    50   ${BLUETOOTH_DEPEND}   ${BLUETOOTH_DEPEND}
    # Line 66  SRCFILE="NetworkManager-${PVER}.tar.xz" Line 63  SRCFILE="NetworkManager-${PVER}.tar.xz"
    63  SRCDIR="${BUILDDIR}/NetworkManager-${PVER}"  SRCDIR="${BUILDDIR}/NetworkManager-${PVER}"
    64    
    65  msetfeature "!check"  msetfeature "!check"
    66  sminclude multilib gnome2 mtools dbus udev systemd python3 mbuild cleanutils  sminclude multilib gnome2 mtools dbus udev systemd python3 meson cleanutils
    67    
    68  NM_CONF_TMP_REV=1.2  NM_CONF_TMP_REV=1.2
    69    
    # Line 89  split_info_libnm() Line 86  split_info_libnm()
    86   PCAT="net-libs"   PCAT="net-libs"
    87  }  }
    88    
     split_info_libnm-glib()  
     {  
      DESCRIPTION="Libraries for adding NetworkManager support to applications that use glib."  
      DEPEND="== net-libs/libnm-${PVER}  
      ${GLIB_DEPEND}"  
      PCAT="net-libs"  
     }  
       
    89  split_info_networkmanager()  split_info_networkmanager()
    90  {  {
    91   DESCRIPTION="Network configuration and management in an easy way."   DESCRIPTION="Network configuration and management in an easy way."
    92   DEPEND="== net-libs/libnm-${PVER}   DEPEND="== net-libs/libnm-${PVER}
      == net-libs/libnm-glib-${PVER}  
    93   ${NM_DEPEND}"   ${NM_DEPEND}"
    94  }  }
    95    
    # Line 163  split_info_networkmanager-tui() Line 151  split_info_networkmanager-tui()
    151    
    152  src_compile()  src_compile()
    153  {  {
    154   local myopts   local myconf
    155   myopts='--libexecdir=/usr/$(mlibdir)/${PNAME}  
    156   --localstatedir=/var   myconf="--localstatedir=/var
    157   --enable-more-warnings=yes   $(meson_opt more_asserts no)
    158   --disable-gtk-doc   $(meson_bool_true more_logging)
    159   --with-dist-version="${PNAME}-${PVER}, Magellan-Linux"   $(meson_bool_false docs)
    160   --with-dbus-sys-dir=$(mget-dbus-config-dir)   $(meson_opt dist-version "'\"${PNAME}-${PVER}, Magellan-Linux\"'")
    161   --with-udev-dir=$(mget-udev-dir)   $(meson_opt dbus_conf_dir $(mget-dbus-config-dir))
    162   --with-systemdsystemunitdir=$(mget-systemd-unit-dir)   $(meson_opt udev_dir $(mget-udev-dir))
    163   --with-pppd-plugin-dir=/usr/$(mlibdir)/pppd/${PPP_PVER}   $(meson_opt systemdsystemunitdir $(mget-systemd-unit-dir))
    164   --with-iptables=/sbin/iptables   $(meson_opt pppd_plugin_dir /usr/$(mlibdir)/pppd/${PPP_PVER})
    165   --with-kernel-firmware-dir=/usr/lib/firmware   $(meson_opt iptables /sbin/iptables)
    166   --with-config-dhcp-default=dhcpcd   $(meson_opt kernel_firmware_dir /usr/lib/firmware)
    167   --with-config-logging-backend-default=keyfile,ibft   $(meson_opt config_dhcp_default dhcpcd)
    168   --with-dhcpcd   $(meson_opt config_plugins_default keyfile,ibft)
    169   --without-dhclient   $(meson_opt config_logging_backend_default journal)
    170   --with-crypto=nss   $(meson_bool_true dhcpcd)
    171   --with-libnm-glib   $(meson_bool_false dhclient)
    172   --with-libsoup   $(meson_bool_false dhcpcanon)
    173   --with-nmcli   $(meson_opt crypto nss)
    174   --with-nmtui   $(meson_bool_true nmcli)
    175   --with-wext   $(meson_bool_true nmtui)
    176   --enable-bluez5-dun   $(meson_bool_true wext)
    177   --enable-wifi   $(meson_bool_true bluez5_dun)
    178   --enable-teamdctl   $(meson_bool_true wifi)
    179   --enable-polkit   $(meson_bool_true teamdctl)
    180   --enable-polkit-agent   $(meson_bool_true polkit)
    181   --enable-json-validation   $(meson_bool_true polkit_agent)
    182   --without-docs   $(meson_bool_true json_validation)
    183   --without-resolvconf   $(meson_opt resolvconf disabled)
    184   --without-consolekit   $(meson_bool_false session_tracking_consolekit)
    185   --without-libaudit   $(meson_opt libaudit no)
    186   --without-netconfig   $(meson_opt netconfig disabled)
    187   --without-ofono   $(meson_bool_false ofono)
    188   --without-selinux   $(meson_bool_false selinux)
    189   --with-session-tracking=systemd   $(meson_opt session_tracking systemd)
    190   --with-suspend-resume=systemd   $(meson_opt suspend_resume systemd)
    191   --with-systemd-journal   $(meson_bool_true systemd_journal)
    192   --with-systemd-logind   $(meson_bool_true modify_system)
    193   --enable-modify-system   $(meson_bool_true modem_manager)
    194   --with-modem-manager-1   $(meson_bool_false ifcfg_rh)
    195   --disable-ifcfg-rh   $(meson_bool_false ifupdown)
    196   --disable-ifcfg-suse   $(meson_bool_false b_lto)
    197   --disable-ifnet   $(meson_bool_true ebpf)
    198   --disable-ifupdown   $(meson_bool_false qt)"
    199   --disable-lto'  
    200     if [[ $(mlibdir) != lib ]]
    201   if [[ $(mlibdir) != lib ]]   then
    202   then   # introspection for abi-m32 has issues to build on multilib systems
    203   # required until pygobject3 honors multilib   MULTILIB_ABIS=m32 meson_configure ${myconf} $(meson_bool_false introspection) || die
    204   only-m32 mconfigure ${myopts} --disable-introspection || die     MULTILIB_ABIS=m64 meson_configure ${myconf} $(meson_bool_true introspection) || die
    205   only-m64 mconfigure ${myopts} --enable-introspection || die   else
    206   else   meson_configure ${myconf} $(meson_bool_true introspection) || die
    207   mconfigure ${myopts} --enable-introspection || die     fi
      fi  
    208    
    209   mmake || die   mninja || die
    210  }  }
    211    
    212  src_install_libnm()  src_install_libnm()
    213  {  {
    214   cd ${SRCDIR}   DESTDIR=${BINDIR} mninja install || die
       
      mmake DESTDIR=${BINDIR} install || die  
    215   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    216   usr/include/libnm \   usr/include/libnm \
    217   usr/$(mlibdir)/libnm.* \   usr/$(mlibdir)/libnm.* \
    # Line 240  src_install_libnm() Line 225  src_install_libnm()
    225   || die   || die
    226  }  }
    227    
     src_install_libnm-glib()  
     {  
      mmake DESTDIR=${BINDIR} install || die  
      zapmost ${BINDIR} \  
      usr/include/libnm-glib \  
      usr/include/NetworkManager \  
      usr/$(mlibdir)/libnm-glib* \  
      usr/$(mlibdir)/libnm-util* \  
      usr/$(mlibdir)/girepository-1.0/NMClient* \  
      usr/$(mlibdir)/girepository-1.0/NetworkManager* \  
      usr/$(mlibdir)/pkgconfig/libnm-glib.pc \  
      usr/$(mlibdir)/pkgconfig/libnm-glib-vpn.pc \  
      usr/$(mlibdir)/pkgconfig/libnm-util.pc \  
      usr/$(mlibdir)/pkgconfig/NetworkManager.pc \  
      $([[ $(mlibdir) != lib ]] && echo "usr/lib/libnm-glib*") \  
      $([[ $(mlibdir) != lib ]] && echo "usr/lib/libnm-util*") \  
      $([[ $(mlibdir) != lib ]] && echo "usr/lib/pkgconfig/libnm-glib.pc") \  
      $([[ $(mlibdir) != lib ]] && echo "usr/lib/pkgconfig/libnm-glib-vpn.pc") \  
      $([[ $(mlibdir) != lib ]] && echo "usr/lib/pkgconfig/libnm-util.pc") \  
      $([[ $(mlibdir) != lib ]] && echo "usr/lib/pkgconfig/NetworkManager.pc") \  
      usr/share/gir-1.0/NMClient-* \  
      usr/share/gir-1.0/NetworkManager-* \  
      usr/share/gtk-doc/html/libnm-glib \  
      usr/share/gtk-doc/html/libnm-util \  
      usr/share/gtk-doc/html/NetworkManager \  
      usr/share/vala/vapi/libnm-glib.* \  
      usr/share/vala/vapi/libnm-util.* \  
      || die  
     }  
       
    228  src_install_networkmanager()  src_install_networkmanager()
    229  {  {
    230   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    231    
    232   mdelete -r /usr/include || die   mdelete -r /usr/include || die
    233   mdelete -r /usr/$(mlibdir)/pkgconfig || die   mdelete -r /usr/$(mlibdir)/pkgconfig || die
    # Line 282  src_install_networkmanager() Line 237  src_install_networkmanager()
    237   mdelete -r /usr/$(mlibdir)/NetworkManager || die   mdelete -r /usr/$(mlibdir)/NetworkManager || die
    238   mdelete -r /usr/$(mlibdir)/pppd || die   mdelete -r /usr/$(mlibdir)/pppd || die
    239   mdelete /usr/bin/nmtui* || die   mdelete /usr/bin/nmtui* || die
    240   mdelete /usr/share/man/man1/nmtui* || die   #mdelete /usr/share/man/man1/nmtui* || die
    241    
    242   # needed directories   # needed directories
    243   mkeepdir /etc/NetworkManager/dispatcher.d || die   mkeepdir /etc/NetworkManager/dispatcher.d || die
    # Line 301  src_install_networkmanager() Line 256  src_install_networkmanager()
    256    
    257  src_install_networkmanager-adsl()  src_install_networkmanager-adsl()
    258  {  {
    259   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    260   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    261   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-adsl.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-adsl.* \
    262   || die   || die
    # Line 309  src_install_networkmanager-adsl() Line 264  src_install_networkmanager-adsl()
    264    
    265  src_install_networkmanager-bluetooth()  src_install_networkmanager-bluetooth()
    266  {  {
    267   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    268   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    269   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-bluetooth.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-bluetooth.* \
    270   || die   || die
    # Line 317  src_install_networkmanager-bluetooth() Line 272  src_install_networkmanager-bluetooth()
    272    
    273  src_install_networkmanager-wifi()  src_install_networkmanager-wifi()
    274  {  {
    275   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    276   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    277   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wifi.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wifi.* \
    278   || die   || die
    # Line 325  src_install_networkmanager-wifi() Line 280  src_install_networkmanager-wifi()
    280    
    281  src_install_networkmanager-wwan()  src_install_networkmanager-wwan()
    282  {  {
    283   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    284   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    285   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wwan.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wwan.* \
    286   usr/$(mlibdir)/NetworkManager/libnm-wan.* \   usr/$(mlibdir)/NetworkManager/libnm-wan.* \
    # Line 334  src_install_networkmanager-wwan() Line 289  src_install_networkmanager-wwan()
    289    
    290  src_install_networkmanager-ppp()  src_install_networkmanager-ppp()
    291  {  {
    292   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    293   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    294   usr/$(mlibdir)/pppd \   usr/$(mlibdir)/pppd \
    295   usr/$(mlibdir)/NetworkManager/libnm-ppp-plugin.* \   usr/$(mlibdir)/NetworkManager/libnm-ppp-plugin.* \
    # Line 343  src_install_networkmanager-ppp() Line 298  src_install_networkmanager-ppp()
    298    
    299  src_install_networkmanager-iscsi()  src_install_networkmanager-iscsi()
    300  {  {
    301   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    302   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    303   usr/$(mlibdir)/NetworkManager/libnm-settings-plugin-ibft.* \   usr/$(mlibdir)/NetworkManager/libnm-settings-plugin-ibft.* \
    304   || die   || die
    # Line 351  src_install_networkmanager-iscsi() Line 306  src_install_networkmanager-iscsi()
    306    
    307  src_install_networkmanager-team()  src_install_networkmanager-team()
    308  {  {
    309   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    310   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    311   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-team.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-team.* \
    312   || die   || die
    # Line 359  src_install_networkmanager-team() Line 314  src_install_networkmanager-team()
    314    
    315  src_install_networkmanager-tui()  src_install_networkmanager-tui()
    316  {  {
    317   mmake DESTDIR=${BINDIR} install || die   DESTDIR=${BINDIR} mninja install || die
    318   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    319   usr/bin/nmtui* \   usr/bin/nmtui* \
      usr/share/man/man1/nmtui* \  
    320   || die   || die
    321     # usr/share/man/man1/nmtui*
    322  }  }
    323    
    324  postinstall_networkmanager()  postinstall_networkmanager()
    Legend:
    Removed from v.33277  
    changed lines
      Added in v.33282