summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-03-06 13:00:07 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2012-03-06 13:00:07 +0100
commit1a6cc347550cfde03be9f3155240b8d0e60e3e39 (patch)
tree47ba90815bc7d126b607634d4d36d7f45a06659e
parent20f45928eaf72ed5413c0ac0c6e30bb771c03a5f (diff)
downloadnetctl-1a6cc347550cfde03be9f3155240b8d0e60e3e39.tar.gz
netctl-1a6cc347550cfde03be9f3155240b8d0e60e3e39.tar.xz
More forgiving Makefile and added PKGBUILD creation
- As noted by Alfredo Palhares it is not always right to fail when the creation of symlinks did not succeed on installation through `make install`. - Building a package is now as easy as `make pkgbuild; makepkg`, although you probably should not execute makepkg inside the source tree.
-rw-r--r--Makefile13
-rw-r--r--contrib/PKGBUILD32
2 files changed, 40 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1a11432..813e24d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
export VERSION = 2.7
-.PHONY: install install-wireless install-docs docs tarball upload clean
+.PHONY: install install-wireless install-docs docs tarball pkgbuild upload clean
install: install-docs
# Configuration files
@@ -12,14 +12,14 @@ install: install-docs
install -d $(DESTDIR)/usr/lib/network/{connections,hooks}
install -m644 src/{network,rfkill,8021x,globals} $(DESTDIR)/usr/lib/network/
install -m755 src/connections/* $(DESTDIR)/usr/lib/network/connections/
- ln -s wireless $(DESTDIR)/usr/lib/network/connections/wireless-dbus
- ln -s ethernet $(DESTDIR)/usr/lib/network/connections/ethernet-iproute
+ -ln -s wireless $(DESTDIR)/usr/lib/network/connections/wireless-dbus
+ -ln -s ethernet $(DESTDIR)/usr/lib/network/connections/ethernet-iproute
# Hooks
install -m755 src/hooks/* ${DESTDIR}/usr/lib/network/hooks/
# Scripts
install -d $(DESTDIR)/usr/bin
install -m755 scripts/netcfg $(DESTDIR)/usr/bin/netcfg2
- ln -s netcfg2 $(DESTDIR)/usr/bin/netcfg
+ -ln -s netcfg2 $(DESTDIR)/usr/bin/netcfg
install -m755 \
scripts/netcfg-menu \
scripts/netcfg-wpa_actiond \
@@ -69,6 +69,9 @@ netcfg-$(VERSION).tar.gz:
tar -zcvf netcfg-$(VERSION).tar.gz netcfg-$(VERSION)
rm -rf netcfg-$(VERSION)
+pkgbuild: netcfg-$(VERSION).tar.gz
+ sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum netcfg-$(VERSION).tar.gz | cut -d ' ' -f 1)/" contrib/PKGBUILD > PKGBUILD
+
upload: netcfg-$(VERSION).tar.gz
md5sum netcfg-$(VERSION).tar.gz > MD5SUMS.$(VERSION)
scp netcfg-$(VERSION).tar.gz MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/
@@ -77,5 +80,5 @@ clean:
$(MAKE) -C docs clean
-@rm -vrf netcfg-$(VERSION) 2>/dev/null
-@rm -vrf pkg 2>/dev/null
- -@rm -vf *.gz MD5SUMS.* 2>/dev/null
+ -@rm -vf PKGBUILD *.gz MD5SUMS.* 2>/dev/null
diff --git a/contrib/PKGBUILD b/contrib/PKGBUILD
new file mode 100644
index 0000000..ae06f12
--- /dev/null
+++ b/contrib/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Jouke Witteveen <j.witteveen@gmail.com>
+
+pkgname=netcfg
+pkgver=%pkgver%
+pkgrel=1
+pkgdesc="Network configuration and profile scripts"
+url="http://archlinux.org"
+license=("BSD")
+backup=(etc/iftab etc/conf.d/netcfg)
+depends=("coreutils" "dhcpcd>=4.0" "iproute2")
+makedepends=('asciidoc')
+optdepends=('dialog: Required for menu based profile and wifi selectors'
+ 'bridge-utils: To set up bridge connections'
+ 'wpa_supplicant: required for wireless network support'
+ 'wpa_actiond: Required for automatic wireless connection with rc.d/net-auto-wireless'
+ 'ifplugd: Required for automatic wired connection with rc.d/net-auto-wired'
+ 'wireless_tools: Required for net-rename'
+ )
+source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.gz)
+arch=(any)
+md5sums=('%md5sum%')
+
+package() {
+ cd "$srcdir/netcfg-${pkgver}"
+ make DESTDIR="$pkgdir" install
+ install -D -m644 LICENSE "$pkgdir/usr/share/licenses/netcfg/LICENSE"
+
+ # Shell Completion
+ install -D -m644 contrib/bash-completion "$pkgdir/etc/bash_completion.d/netcfg"
+ install -D -m644 contrib/zsh-completion "$pkgdir/usr/share/zsh/site-functions/_netcfg"
+}
+