Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/networkmanager/networkmanager-1.8.0-r2.smage2

    Diff of /trunk/extras/networkmanager/networkmanager-1.8.0-r2.smage2

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

    revision 29012 by niro, Wed May 17 13:33:18 2017 UTC revision 29013 by niro, Wed May 17 14:15:41 2017 UTC
    # Line 159  split_info_networkmanager-tui() Line 159  split_info_networkmanager-tui()
    159    
    160  src_compile()  src_compile()
    161  {  {
    162   cd ${SRCDIR}   local myopts
    163     myopts='--libexecdir=/usr/$(mlibdir)/${PNAME}
    164   mconfigure \   --localstatedir=/var
    165   --libexecdir=/usr/$(mlibdir)/${PNAME} \   --enable-more-warnings=yes
    166   --localstatedir=/var \   --disable-gtk-doc
    167   --enable-more-warnings=yes \   --with-dist-version="${PNAME}-${PVER}, Magellan-Linux"
    168   --disable-gtk-doc \   --with-dbus-sys-dir=$(mget-dbus-config-dir)
    169   --with-dist-version="${PNAME}-${PVER}, Magellan-Linux" \   --with-udev-dir=$(mget-udev-dir)
    170   --with-dbus-sys-dir=$(mget-dbus-config-dir) \   --with-systemdsystemunitdir=$(mget-systemd-unit-dir)
    171   --with-udev-dir=$(mget-udev-dir) \   --with-pppd-plugin-dir=/usr/$(mlibdir)/pppd/${PPP_PVER}
    172   --with-systemdsystemunitdir=$(mget-systemd-unit-dir) \   --with-iptables=/sbin/iptables
    173   --with-pppd-plugin-dir=/usr/$(mlibdir)/pppd/${PPP_PVER} \   --with-kernel-firmware-dir=/usr/lib/firmware
    174   --with-iptables=/sbin/iptables \   --with-config-dhcp-default=dhcpcd
    175   --with-kernel-firmware-dir=/usr/lib/firmware \   --with-config-logging-backend-default=keyfile,ibft
    176   --with-config-dhcp-default=dhcpcd \   --with-dhcpcd
    177   --with-config-logging-backend-default=keyfile,ibft \   --without-dhclient
    178   --with-dhcpcd \   --with-crypto=nss
    179   --without-dhclient \   --with-libnm-glib
    180   --with-crypto=nss \   --with-libsoup
    181   --with-libnm-glib \   --with-nmcli
    182   --with-libsoup \   --with-nmtui
    183   --with-nmcli \   --with-wext
    184   --with-nmtui \   --enable-bluez5-dun
    185   --with-wext \   --enable-wifi
    186   --enable-bluez5-dun \   --enable-teamdctl
    187   --enable-wifi \   --enable-polkit
    188   --enable-teamdctl \   --enable-polkit-agent
    189   --enable-polkit \   --enable-json-validation
    190   --enable-polkit-agent \   --without-docs
    191   $([[ ${ARCH} = x86_64} ]] && MULTILIB_VERBOSE=false only-m32 echo "--disable-introspection") \   --without-resolvconf
    192   $([[ ${ARCH} = x86_64} ]] && MULTILIB_VERBOSE=false only-m64 echo "--enable-introspection") \   --without-consolekit
    193   $([[ ${ARCH} != x86_64} ]] && echo "--enable-introspection") \   --without-libaudit
    194   --enable-json-validation \   --without-netconfig
    195   --without-docs \   --without-ofono
    196   --without-resolvconf \   --without-selinux
    197   --without-consolekit \   --with-session-tracking=systemd
    198   --without-libaudit \   --with-suspend-resume=systemd
    199   --without-netconfig \   --with-systemd-journal
    200   --without-ofono \   --with-systemd-logind
    201   --without-selinux \   --enable-modify-system
    202   --with-session-tracking=systemd \   --with-modem-manager-1
    203   --with-suspend-resume=systemd \   --disable-ifcfg-rh
    204   --with-systemd-journal \   --disable-ifcfg-suse
    205   --with-systemd-logind \   --disable-ifnet
    206   --enable-modify-system \   --disable-ifupdown
    207   --with-modem-manager-1 \   --disable-lto'
    208   --disable-ifcfg-rh \  
    209   --disable-ifcfg-suse \   if [[ $(mlibdir) != lib ]]
    210   --disable-ifnet \   then
    211   --disable-ifupdown \   only-m32 mconfigure ${myopts} --disable-introspection || die  
    212   --disable-lto \   only-m64 mconfigure ${myopts} --enable-introspection || die
    213   || die   else
    214     mconfigure ${myopts} --enable-introspection || die  
    215     fi
    216    
    217   mmake || die   mmake || die
    218  }  }
    # Line 235  src_install_libnm() Line 237  src_install_libnm()
    237    
    238  src_install_libnm-glib()  src_install_libnm-glib()
    239  {  {
      cd ${SRCDIR}  
       
    240   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    241   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    242   usr/include/libnm-glib \   usr/include/libnm-glib \
    # Line 267  src_install_libnm-glib() Line 267  src_install_libnm-glib()
    267    
    268  src_install_networkmanager()  src_install_networkmanager()
    269  {  {
      cd ${SRCDIR}  
       
    270   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    271    
    272   mdelete -r /usr/include || die   mdelete -r /usr/include || die
    # Line 298  src_install_networkmanager() Line 296  src_install_networkmanager()
    296    
    297  src_install_networkmanager-adsl()  src_install_networkmanager-adsl()
    298  {  {
      cd ${SRCDIR}  
       
    299   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    300   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    301   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-adsl.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-adsl.* \
    # Line 308  src_install_networkmanager-adsl() Line 304  src_install_networkmanager-adsl()
    304    
    305  src_install_networkmanager-bluetooth()  src_install_networkmanager-bluetooth()
    306  {  {
      cd ${SRCDIR}  
       
    307   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    308   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    309   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-bluetooth.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-bluetooth.* \
    # Line 318  src_install_networkmanager-bluetooth() Line 312  src_install_networkmanager-bluetooth()
    312    
    313  src_install_networkmanager-wifi()  src_install_networkmanager-wifi()
    314  {  {
      cd ${SRCDIR}  
       
    315   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    316   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    317   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wifi.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wifi.* \
    # Line 328  src_install_networkmanager-wifi() Line 320  src_install_networkmanager-wifi()
    320    
    321  src_install_networkmanager-wwan()  src_install_networkmanager-wwan()
    322  {  {
      cd ${SRCDIR}  
       
    323   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    324   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    325   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wwan.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-wwan.* \
    # Line 338  src_install_networkmanager-wwan() Line 328  src_install_networkmanager-wwan()
    328    
    329  src_install_networkmanager-ppp()  src_install_networkmanager-ppp()
    330  {  {
      cd ${SRCDIR}  
       
    331   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    332   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    333   usr/$(mlibdir)/pppd \   usr/$(mlibdir)/pppd \
    # Line 349  src_install_networkmanager-ppp() Line 337  src_install_networkmanager-ppp()
    337    
    338  src_install_networkmanager-iscsi()  src_install_networkmanager-iscsi()
    339  {  {
      cd ${SRCDIR}  
       
    340   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    341   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    342   usr/$(mlibdir)/NetworkManager/libnm-settings-plugin-ibft.* \   usr/$(mlibdir)/NetworkManager/libnm-settings-plugin-ibft.* \
    # Line 359  src_install_networkmanager-iscsi() Line 345  src_install_networkmanager-iscsi()
    345    
    346  src_install_networkmanager-team()  src_install_networkmanager-team()
    347  {  {
      cd ${SRCDIR}  
       
    348   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    349   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    350   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-team.* \   usr/$(mlibdir)/NetworkManager/libnm-device-plugin-team.* \
    # Line 369  src_install_networkmanager-team() Line 353  src_install_networkmanager-team()
    353    
    354  src_install_networkmanager-tui()  src_install_networkmanager-tui()
    355  {  {
      cd ${SRCDIR}  
       
    356   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    357   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    358   usr/bin/nmtui* \   usr/bin/nmtui* \
    Legend:
    Removed from v.29012  
    changed lines
      Added in v.29013