[hackers] [skvm] Changed PKGBUILD to pull from suckless.org, tiny fixes in skvm.c and removed Wunreachable-code || Dimitrios Papastamos

changeset: 6:33742aab4189
tag: tip
user: Dimitrios Papastamos <stateless [at] archlinux.us>
date: Sun May 03 15:27:09 2009 -0700
files: Makefile PKGBUILD TODO skvm.c
description:
Changed PKGBUILD to pull from suckless.org, tiny fixes in skvm.c and removed Wunreachable-code
which was giving false warnings.

diff -r 8b4f4992bf52 -r 33742aab4189 Makefile
--- a/Makefile Fri May 01 18:02:07 2009 -0700
+++ b/Makefile Sun May 03 15:27:09 2009 -0700
@@ -5,7 +5,7 @@
 
 CC = gcc
 CFLAGS += -Wall -Wextra -std=gnu99 -Wformat-security -Wshadow \
- -Wunreachable-code -Wpointer-arith -ggdb \
+ -Wpointer-arith -ggdb \
                          $(shell pkg-config --cflags glib-2.0 dbus-glib-1)
 LDFLAGS += -lhal -lhal-storage $(shell pkg-config --libs glib-2.0 dbus-glib-1)
 
diff -r 8b4f4992bf52 -r 33742aab4189 PKGBUILD
--- a/PKGBUILD Fri May 01 18:02:07 2009 -0700
+++ b/PKGBUILD Sun May 03 15:27:09 2009 -0700
@@ -1,45 +1,48 @@
 # Contributor: Ondrej Martinak <omartinak_AT_gmail.com>
 
-pkgname=skvm-git
-pkgver=20090415
+pkgname=skvm-hg
+pkgver=0.1
 pkgrel=1
 pkgdesc="Lightweight volume manager"
 arch=('i686' 'x86_64')
-url="http://github.com/dimigon/skvm/tree/master"
+url="http://code.suckless.org/hg/skvm"
 license=('GPL')
 depends=('hal' 'dbus')
-makedepends=('git')
+makedepends=('mercurial')
 conflicts=('skvm')
 provides=('skvm')
 
-_gitroot="git://github.com/dimigon/skvm.git"
-_gitname="skvm"
+_hgroot="http://code.suckless.org/hg/skvm"
+_hgname="skvm"
 
 build() {
- cd ${srcdir}
-
- msg "Connecting to GIT server..."
-
- if [ -d $_gitname ]; then
- cd $_gitname && git pull origin
- cd ..
- msg "The local files are updated."
- else
- git clone $_gitroot
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting make..."
-
- rm -rf $_gitname-build
- cp -r $_gitname $_gitname-build
- cd $_gitname-build
-
- make || return 1
-
- mkdir -p ${startdir}/pkg/usr/bin
- mkdir -p ${startdir}/pkg/etc/rc.d
-
- install -m 755 skvm ${startdir}/pkg/usr/bin/skvm
- install -m 755 init/skvm ${startdir}/pkg/etc/rc.d/skvm
+ cd ${srcdir}
+
+ msg "Connecting to mercurial server..."
+
+ if [ -d $_hgname ]; then
+ cd $_hgname && hg pull
+ cd ..
+ msg "The local files are updated."
+ else
+ hg clone $_hgroot
+ fi
+
+ msg "Mercurial checkout done or server timeout."
+ msg "Starting make..."
+
+ rm -rf $_hgname-build
+ cp -r $_hgname $_hgname-build
+ cd $_hgname-build
+
+ make || return 1
+
+ mkdir -p ${startdir}/pkg/usr/bin
+ mkdir -p ${startdir}/pkg/etc/rc.d
+ mkdir -p ${startdir}/pkg/usr/local/share/man/man1
+
+ install -m 755 skvm ${startdir}/pkg/usr/bin/skvm
+ install -m 755 init/skvm ${startdir}/pkg/etc/rc.d/skvm
+ sed "s/VERSION/${pkgver}/g" < skvm.1 > ${startdir}/pkg/usr/local/share/man/man1/skvm.1
+ chmod 644 ${startdir}/pkg/usr/local/share/man/man1/skvm.1
 }
diff -r 8b4f4992bf52 -r 33742aab4189 TODO
--- a/TODO Fri May 01 18:02:07 2009 -0700
+++ b/TODO Sun May 03 15:27:09 2009 -0700
@@ -1,3 +1,1 @@
 SKVM --- TODO
-
- * add support for LUKS.
diff -r 8b4f4992bf52 -r 33742aab4189 skvm.c
--- a/skvm.c Fri May 01 18:02:07 2009 -0700
+++ b/skvm.c Sun May 03 15:27:09 2009 -0700
@@ -618,8 +618,7 @@
       goto out;
 
    snprintf(buf, sizeof(buf), "%jd\n", (intmax_t)getpid());
- if (write(pid_fd, buf, strlen(buf)) != (ssize_t)strlen(buf))
- goto out;
+ write(pid_fd, buf, strlen(buf));
    return 0;
 
 out:
Received on Sun May 03 2009 - 14:27:20 UTC