summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-08-01 08:52:39 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-08-01 08:52:39 (GMT)
commite088246e81c88f1f7cbef74d7df7f5359cc9b72c (patch)
treeaa663b50a7aff7ecc1f5165a82ac9aa877bbf4da
parentc4ea04ca36cb1401ba4fc4a43668180a7e01d280 (diff)
downloadlinhes_pkgbuild-e088246e81c88f1f7cbef74d7df7f5359cc9b72c.zip
linhes_pkgbuild-e088246e81c88f1f7cbef74d7df7f5359cc9b72c.tar.gz
linhes_pkgbuild-e088246e81c88f1f7cbef74d7df7f5359cc9b72c.tar.bz2
initscripts: move conf.d/wireless to wireless.example.
Quick and easy way to get around a file conflict
-rw-r--r--abs/core/initscripts/PKGBUILD4
-rw-r--r--abs/core/initscripts/__changelog6
2 files changed, 8 insertions, 2 deletions
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD
index 1b93983..0e07da3 100644
--- a/abs/core/initscripts/PKGBUILD
+++ b/abs/core/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=initscripts
pkgver=2011.06.4
-pkgrel=2
+pkgrel=3
pkgdesc="System initialization/bootup scripts"
arch=('i686' 'x86_64')
url="http://www.archlinux.org"
@@ -32,7 +32,7 @@ package() {
patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
patch -p0 < ${srcdir}/rc.multi.patch || exit 1
make DESTDIR=${pkgdir} install
- install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
+ install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example
}
md5sums=('34cbe55f3f42069c59237db935d0511b'
'027576534885b8d5dded9be546057b12'
diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog
index 8d03d24..58bfd36 100644
--- a/abs/core/initscripts/__changelog
+++ b/abs/core/initscripts/__changelog
@@ -1 +1,7 @@
Patch init scripts
+ patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1
+ patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
+ patch -p0 < ${srcdir}/rc.multi.patch || exit 1
+
+
+rename wireless.conf -> wireless.conf.example