[arch-commits] Commit in util-linux-ng/trunk (PKGBUILD fsck-static.patch)

[Jan de Groot]

    Date: Saturday, August 1, 2009 @ 09:05:55
  Author: jgc
Revision: 48301

upgpkg: util-linux-ng 2.16-1
    Add static version of fsck, just like we had in e2fsprogs

Added:
  util-linux-ng/trunk/fsck-static.patch
Modified:
  util-linux-ng/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   10 ++++++++--
 fsck-static.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-01 12:36:50 UTC (rev 48300)
+++ PKGBUILD	2009-08-01 13:05:55 UTC (rev 48301)
@@ -15,19 +15,25 @@
 license=('GPL2')
 options=('!libtool')
 source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.16/${pkgname}-${pkgver}.tar.bz2
-	http://loop-aes.sourceforge.net/updates/${pkgname}-${pkgver}-${_loop_date}.diff.bz2)
+        http://loop-aes.sourceforge.net/updates/${pkgname}-${pkgver}-${_loop_date}.diff.bz2
+        fsck-static.patch)
 install=util-linux-ng.install
 md5sums=('9623380641b0c2e0449f5b1ecc567663'
-         '1752b93df05410a8df8e84d07d41f048')
+         '1752b93df05410a8df8e84d07d41f048'
+         '35c3ba312782f042b594399b50b8de62')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # Provide static fsck
+  patch -Np1 -i "${srcdir}/fsck-static.patch" || return 1
 
   # cryptoloop support
   patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-${_loop_date}.diff" || return 1
   # hardware clock
   sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1
   mkdir -p "${pkgdir}/var/lib/hwclock" || return 1
+  autoconf || return 1
+  automake || return 1
   ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev || return 1
   make HAVE_SLN=yes ADD_RAW=yes || return 1
   make HAVE_SLN=yes ADD_RAW=yes DESTDIR="${pkgdir}" install || return 1

Added: fsck-static.patch
===================================================================
--- fsck-static.patch	                        (rev 0)
+++ fsck-static.patch	2009-08-01 13:05:55 UTC (rev 48301)
@@ -0,0 +1,29 @@
+--- util-linux-ng-2.16/fsck/Makefile.am	2009-07-04 01:20:01.000000000 +0200
++++ util-linux-ng-2.16.new/fsck/Makefile.am	2009-08-01 14:16:31.000000000 +0200
+@@ -1,17 +1,25 @@
+ include $(top_srcdir)/config/include-Makefile.am
+ 
+-sbin_PROGRAMS = fsck
++sbin_PROGRAMS = fsck fsck.static
+ dist_man_MANS = fsck.8
+ 
+ fsck_SOURCES = base_device.c fsck.c fsck.h ../lib/ismounted.c \
+ 	       ../lib/fsprobe.c ../lib/canonicalize.c
++fsck_static_SOURCES = $(fsck_SOURCES)
+ fsck_LDADD =
+ fsck_CFLAGS =
++fsck_static_LDADD =
++fsck_static_CFLAGS =
++fsck_static_LDFLAGS = -all-static
+ 
+ if BUILD_LIBBLKID
+ fsck_LDADD += $(ul_libblkid_la)
+ fsck_CFLAGS += -I$(ul_libblkid_srcdir)
++fsck_static_LDADD += $(ul_libblkid_la)
++fsck_static_CFLAGS += -I$(ul_libblkid_srcdir)
+ else
+ fsck_LDADD += $(BLKID_LIBS)
+ fsck_CFLAGS += $(BLKID_CFLAGS)
++fsck_static_LDADD += $(BLKID_LIBS)
++fsck_static_CFLAGS += $(BLKID_CFLAGS)
+ endif