Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=d1cb8964f04043b3fdd3a3de4d898541b6d8650b
commit d1cb8964f04043b3fdd3a3de4d898541b6d8650b
Author: Janos Kovacs <[EMAIL PROTECTED]>
Date: Thu Mar 6 19:34:28 2008 +0100
squashfs-3.3-3-i686
* version bump
diff --git a/source/apps-extra/squashfs/FrugalBuild
b/source/apps-extra/squashfs/FrugalBuild
index 367f3d0..138b83d 100644
--- a/source/apps-extra/squashfs/FrugalBuild
+++ b/source/apps-extra/squashfs/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=squashfs
pkgver=3.3
lzmaver=457
-kver=2.6.23-6
+kver=2.6.24-3
kdir=/lib/modules/${kver/-/-fw}/kernel/fs/${pkgname}
pkgrel=3
url="http://www.squashfs-lzma.org";
@@ -14,13 +14,20 @@ makedepends=("kernel-fwlive-source=$kver")
groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump
http://sourceforge.net/project/showfiles.php?group_id=63835|grep
squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'"
-source=(${url}/dl/lzma${lzmaver}.tar.bz2 ${url}/dl/${pkgname}-cvsfix.patch \
- ${url}/dl/${pkgname}3.3.tar.gz ${url}/dl/sqlzma3.3-${lzmaver}.tar.bz2
mksquashfs.quiet.patch)
+source=(${url}/dl/lzma${lzmaver}.tar.bz2 \
+ ${url}/dl/${pkgname}3.3.tar.gz \
+ ${url}/dl/sqlzma3.3-${lzmaver}.tar.bz2 \
+
http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/${pkgname}-cvsfix.patch \
+
http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/sqlzma1-449.patch \
+
http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/sqlzma2u-3.3.patch \
+
http://frugalware.org/~janny/patchs/kernel/${kver/-*/}/mksquashfs.quiet.patch )
options=('scriptlet')
sha1sums=('bd1b46ba42fe1ad7351a39c131e8b7657e909001' \
- '17da1cd356cd50a1c1cefb86670437abcdb83986' \
'e610ee21fb910606615cd158eda3c650af8a61cc' \
'adec846e3b3b57337ccddbc8aafab3da0b049753' \
+ '17da1cd356cd50a1c1cefb86670437abcdb83986' \
+ '4b89853ff744e02f970c667bc374ce4fa5400d08' \
+ '5620c20b72a039eae12fcc1ad6f28bc1b381c8a9' \
'11cbb2475fe34e94bc869ae33e52c343ee497977')
build()
@@ -30,6 +37,7 @@ build()
tar -C lzma${lzmaver} -xf lzma${lzmaver}.tar.bz2 || Fdie
Fmessage "copy /usr/src/linux/ ./"
cp -a /usr/src/linux/ ./ || Fdie
+ Fmessage "patching"
patch -p0 <squashfs-cvsfix.patch
patch -p0 <sqlzma2u-3.3.patch || Fdie
if [ "$CARCH" == "x86_64" ]; then
@@ -41,13 +49,14 @@ build()
cd ../${pkgname}${pkgver}/squashfs-tools || Fdie
patch -p0 <../../mksquashfs.quiet.patch || Fdie
cd ${Fsrcdir} || Fdie
+ Fmessage "sed Makefile"
sed -i "s|KDir =.*|KDir = $Fsrcdir/linux|" Makefile || Fdie
sed -i "s|SqFs =.*|SqFs = $Fsrcdir/linux/fs/squashfs|" Makefile || Fdie
sed -i "s/LzmaVer =.*/LzmaVer = lzma${lzmaver}/" Makefile || Fdie
sed -i "s/C=1/C=0/" Makefile || Fdie
-
+ Fmessage "Compiling"
make || Fdie
-
+ Fmessage "Installing files"
Fmkdir $kdir
Ffilerel linux/fs/squashfs/squashfs.ko $kdir
Ffilerel lzma${lzmaver}/C/Compress/Lzma/kmod/{un,sq}lzma.ko $kdir
diff --git a/source/apps-extra/squashfs/mksquashfs.quiet.patch
b/source/apps-extra/squashfs/mksquashfs.quiet.patch
deleted file mode 100644
index 8195ea5..0000000
--- a/source/apps-extra/squashfs/mksquashfs.quiet.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mksquashfs.c 2007-01-16 01:33:13.000000000 +0000
-+++ mksquashfs.c.new 2007-01-18 18:59:44.623963706 +0000
-@@ -1832,17 +1832,17 @@
- if(!progress || columns - used < 0)
- return;
-
-- printf("\r[");
-+ fprintf(stderr,"\r[");
-
- while (hashes --)
-- putchar('=');
-+ fprintf(stderr,"=");
-
- while(spaces --)
-- putchar(' ');
-+ fprintf(stderr," ");
-
-- printf("] %*lld/%*lld", max_digits, current, max_digits, max);
-- printf(" %3lld%%", current * 100 / max);
-- fflush(stdout);
-+ fprintf(stderr,"] %*lld/%*lld", max_digits, current, max_digits, max);
-+ fprintf(stderr," %3lld%%", current * 100 / max);
-+ fflush(stderr);
- return 0;
- }
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
