From 4216449f2681d5029fe65be01b8ff47528ec9bdf Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 19 Jan 2022 16:30:58 +0000 Subject: moved network manager to system --- repo/skip/networkmanager.xibuild | 51 -------------------------------------- repo/system/networkmanager.xibuild | 51 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 repo/skip/networkmanager.xibuild create mode 100644 repo/system/networkmanager.xibuild diff --git a/repo/skip/networkmanager.xibuild b/repo/skip/networkmanager.xibuild deleted file mode 100644 index d524935..0000000 --- a/repo/skip/networkmanager.xibuild +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -DEPS=(jansson libndp curl wpa_supplicant newt nss polkit libpsl audit) - -PKG_VER=1.34 -SOURCE=https://download.gnome.org/sources/NetworkManager/$(echo $PKG_VER | cut -d. -f-2)/NetworkManager-$PKG_VER.tar.xz -DESC="Network connection manager and user applications" - -prepare () { - grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' - -} - -build () { - mkdir build && - cd build && - - CXXFLAGS+="-O2 -fPIC" \ - meson --prefix=/usr \ - --buildtype=release \ - -Dlibaudit=no \ - -Dlibpsl=false \ - -Dnmtui=true \ - -Dovs=false \ - -Dppp=false \ - -Dselinux=false \ - -Dsession_tracking=elogind \ - -Dmodem_manager=false \ - -Dsystemdsystemunitdir=no \ - -Dsystemd_journal=false \ - -Dqt=false \ - .. && - ninja -} - -package () { - DESTDIR=$PKG_DEST ninja install && - mv -v $PKG_DEST/usr/share/doc/NetworkManager{,-$PKG_VER} - - # create minimum config file - cat >> $PKG_DEST/etc/NetworkManager/NetworkManager.conf << "EOF" -[main] -plugins=keyfile -EOF - cat > $PKG_DEST/etc/NetworkManager/conf.d/polkit.conf << "EOF" -[main] -auth-polkit=true -EOF - -# TODO add boot scripts -} diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild new file mode 100644 index 0000000..d524935 --- /dev/null +++ b/repo/system/networkmanager.xibuild @@ -0,0 +1,51 @@ +#!/bin/bash + +DEPS=(jansson libndp curl wpa_supplicant newt nss polkit libpsl audit) + +PKG_VER=1.34 +SOURCE=https://download.gnome.org/sources/NetworkManager/$(echo $PKG_VER | cut -d. -f-2)/NetworkManager-$PKG_VER.tar.xz +DESC="Network connection manager and user applications" + +prepare () { + grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' + +} + +build () { + mkdir build && + cd build && + + CXXFLAGS+="-O2 -fPIC" \ + meson --prefix=/usr \ + --buildtype=release \ + -Dlibaudit=no \ + -Dlibpsl=false \ + -Dnmtui=true \ + -Dovs=false \ + -Dppp=false \ + -Dselinux=false \ + -Dsession_tracking=elogind \ + -Dmodem_manager=false \ + -Dsystemdsystemunitdir=no \ + -Dsystemd_journal=false \ + -Dqt=false \ + .. && + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install && + mv -v $PKG_DEST/usr/share/doc/NetworkManager{,-$PKG_VER} + + # create minimum config file + cat >> $PKG_DEST/etc/NetworkManager/NetworkManager.conf << "EOF" +[main] +plugins=keyfile +EOF + cat > $PKG_DEST/etc/NetworkManager/conf.d/polkit.conf << "EOF" +[main] +auth-polkit=true +EOF + +# TODO add boot scripts +} -- cgit v1.2.1