[arch-commits] Commit in e2fsprogs/trunk (Makefile-fsck.static.patch PKGBUILD)

[Jan de Groot]

    Date: Saturday, August 1, 2009 @ 09:10:39
  Author: jgc
Revision: 48303

upgpkg: e2fsprogs 1.41.8-2
    Build without libs and tools provided by util-linux-ng

Modified:
  e2fsprogs/trunk/PKGBUILD
Deleted:
  e2fsprogs/trunk/Makefile-fsck.static.patch

----------------------------+
 Makefile-fsck.static.patch |   13 -------------
 PKGBUILD                   |   36 ++++++++++++++----------------------
 2 files changed, 14 insertions(+), 35 deletions(-)

Deleted: Makefile-fsck.static.patch
===================================================================
--- Makefile-fsck.static.patch	2009-08-01 13:06:33 UTC (rev 48302)
+++ Makefile-fsck.static.patch	2009-08-01 13:10:39 UTC (rev 48303)
@@ -1,13 +0,0 @@
---- e2fsprogs-1.40.4/misc/Makefile	2008-01-16 14:52:53.000000000 +0000
-+++ e2fsprogs-1.40.4/misc/Makefile.neu	2008-01-16 14:53:43.000000000 +0000
-@@ -376,6 +376,10 @@
- 	@echo "	LD $@"
- 	@$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL)
- 
-+fsck.static: $(FSCK_OBJS) $(DEPSTATIC_LIBBLKID)
-+	@echo "	LD $@"
-+	@$(CC) $(ALL_LDFLAGS) -static -o fsck.static $(FSCK_OBJS) $(STATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(LIBINTL)
-+
- badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
- 	@echo "	LD $@"
- 	@$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-01 13:06:33 UTC (rev 48302)
+++ PKGBUILD	2009-08-01 13:10:39 UTC (rev 48303)
@@ -4,45 +4,37 @@
 
 pkgname=e2fsprogs
 pkgver=1.41.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'MIT' 'BSD')
+license=('GPL' 'LGPL' 'MIT')
 url="http://e2fsprogs.sourceforge.net"
 groups=('base')
-depends=('glibc' 'bash')
+depends=('sh' 'util-linux-ng>=2.16')
 makedepends=('bc')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	'Makefile-fsck.static.patch' 'MIT-LICENSE')
+        MIT-LICENSE)
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
 md5sums=('6708cc8e484809fc5cfb232882e48489'
-         'ce2b0daf84e17e8c7880ba3d43020ea3'
          '035b7c69b7a2cecf996a4708c262245e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   # Remove unnecessary init.d directory
-  sed -i '/init\.d/s|^|#|' misc/Makefile.in
+  sed -i '/init\.d/s|^|#|' misc/Makefile.in || return 1
 
-  ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs
+  ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \
+      --disable-fsck --disable-uuidd \
+      --disable-libuuid --disable-libblkid || return 1
   
-  # add fsck.static for mkinitrd use
-  patch -Np1 -i ../Makefile-fsck.static.patch || return 1
-  
   make || return 1
-  make DESTDIR=${pkgdir} install install-libs || return 1
-  make -C ${srcdir}/${pkgname}-${pkgver}/misc fsck.static || return 1
+  make DESTDIR="${pkgdir}" install install-libs || return 1
   
-  install -D -m755 ${srcdir}/${pkgname}-${pkgver}/misc/fsck.static \
-	 ${pkgdir}/sbin/fsck.static || return 1
-  
-  sed -i -e 's/^AWK=.*/AWK=awk/' ${pkgdir}/usr/bin/compile_et || return 1
+  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1
 
-  # install MIT and BSD licenses
-  install -Dm644 ${srcdir}/MIT-LICENSE \
-	${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/lib/uuid/COPYING \
-	${pkgdir}/usr/share/licenses/${pkgname}/BSD-LICENSE
+  # install MIT license
+  install -Dm644 "${srcdir}/MIT-LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1
 }