Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=666c1173cd5f197be35112beba85b077c3a809a4
commit 666c1173cd5f197be35112beba85b077c3a809a4
Author: janny <[EMAIL PROTECTED]>
Date: Sat Mar 1 15:59:37 2008 +0100
squashfs-3.3-3-i686
* release bump with new kernel
diff --git a/source/apps-extra/squashfs/FrugalBuild
b/source/apps-extra/squashfs/FrugalBuild
index 7e82bd9..138b83d 100644
--- a/source/apps-extra/squashfs/FrugalBuild
+++ b/source/apps-extra/squashfs/FrugalBuild
@@ -2,52 +2,65 @@
# Maintainer: VMiklos <[EMAIL PROTECTED]>
pkgname=squashfs
-pkgver=3.2_r2
-kver=2.6.22-1
-kdir=/lib/modules/${kver/-/-fw}/kernel/fs/squashfs
-pkgrel=5
+pkgver=3.3
+lzmaver=457
+kver=2.6.24-3
+kdir=/lib/modules/${kver/-/-fw}/kernel/fs/${pkgname}
+pkgrel=3
+url="http://www.squashfs-lzma.org";
pkgdesc="A highly compressed read-only filesystem for Linux."
depends=('zlib' "kernel-fwlive=$kver")
makedepends=("kernel-fwlive-source=$kver")
groups=('apps-extra')
archs=('i686' 'x86_64')
-#_F_kernel_name="-fwlive"
-Finclude sourceforge
up2date="lynx -dump
http://sourceforge.net/project/showfiles.php?group_id=63835|grep
squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'"
-source=(${source/squashfs-/squashfs} \
-
http://$_F_sourceforge_mirror.dl.sourceforge.net/sevenzip/lzma443.tar.bz2 \
-
ftp://ftp.slax.org/source/slax/kernel/2.6.21.5/src-core/patches/squashfs/sqlzma.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' \
+ 'e610ee21fb910606615cd158eda3c650af8a61cc' \
+ 'adec846e3b3b57337ccddbc8aafab3da0b049753' \
+ '17da1cd356cd50a1c1cefb86670437abcdb83986' \
+ '4b89853ff744e02f970c667bc374ce4fa5400d08' \
+ '5620c20b72a039eae12fcc1ad6f28bc1b381c8a9' \
+ '11cbb2475fe34e94bc869ae33e52c343ee497977')
build()
{
- rm -rf lzma443
- mkdir -p lzma443 || Fdie
- tar -C lzma443 -xf lzma443.tar.bz2 || Fdie
- rm sqlzma2k-3.2-r2.patch
- patch -p0 <sqlzma2u-3.2-r2.patch || Fdie
- patch -p0 <mksquashfs.quiet.patch || Fdie
+ rm -rf lzma${lzmaver} || Fdie
+ mkdir -p lzma${lzmaver} || Fdie
+ 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
- sed -i 's/-Werror//' sqlzma1-443.patch || Fdie
+ sed -i 's/-Werror//' sqlzma1-${lzmaver}.patch || Fdie
sed -i 's/-Werror//' Makefile || Fdie
fi
- patch -p0 <sqlzma1-443.patch || Fdie
-# cat *.patch | patch -p0 || return 1
- cp -a /usr/src/linux/ ./
+ cd lzma${lzmaver} || Fdie
+ patch -p1 <../sqlzma1-449.patch || Fdie
+ 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 lzma443/C/7zip/Compress/LZMA_C/kmod/{un,sq}lzma.ko $kdir
+ Ffilerel lzma${lzmaver}/C/Compress/Lzma/kmod/{un,sq}lzma.ko $kdir
Fexerel squashfs${pkgver/_/-}/squashfs-tools/{mk,un}squashfs /usr/bin/
}
-sha1sums=('e38c16c09435291b2c97aa0a321c29da442ff686' \
- '1667abfb40da82d53fa2690f3cd58a0e7e751e55' \
- '26e02ccaabd4b0c1bcf1452c6aa42644954959d6' \
- '910679b57a7b30f2969cc9e8fd622d0b6a237bcd')
# optimization OK
diff --git a/source/apps-extra/squashfs/mksquashfs.quiet.patch
b/source/apps-extra/squashfs/mksquashfs.quiet.patch
deleted file mode 100644
index 0eadcb4..0000000
--- a/source/apps-extra/squashfs/mksquashfs.quiet.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- squashfs3.2-r2/squashfs-tools/mksquashfs.c 2007-01-16 01:33:13.000000000
+0000
-+++ squashfs3.2-r2/squashfs-tools/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
