From 2e6d03a77a7eeba8fa240118a64428c1b12c69da Mon Sep 17 00:00:00 2001 From: fake Date: Fri, 28 Oct 2005 17:03:21 +0000 Subject: [PATCH] fake: update squashfstools to 2.2-r2, fixing build for actual kernel(s). [2005101209151630703] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6520 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/fake/squashfs-tools/squashfs-tools.desc | 4 ++-- target/livecd/download.txt | 2 +- target/livecd/pkg_linux.conf | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/fake/squashfs-tools/squashfs-tools.desc b/package/fake/squashfs-tools/squashfs-tools.desc index 7d566097a..0b32e2bfe 100644 --- a/package/fake/squashfs-tools/squashfs-tools.desc +++ b/package/fake/squashfs-tools/squashfs-tools.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 2.1 +[V] 2.2-r2 [P] X -X---5---- 104.500 -[D] 3903183588 squashfs2.1.tar.gz http://dl.sourceforge.net/squashfs/ +[D] 3832598306 squashfs2.2-r2.tar.gz http://dl.sourceforge.net/squashfs/ diff --git a/target/livecd/download.txt b/target/livecd/download.txt index 560dfd1c6..e9cf71912 100644 --- a/target/livecd/download.txt +++ b/target/livecd/download.txt @@ -1 +1 @@ -2107260339 squashfs2.1-fake.tar.bz2 http://www.rocklinux.net/people/fake/squashfs/ +3832598306 squashfs2.2-r2.tar.gz http://dl.sourceforge.net/squashfs/ diff --git a/target/livecd/pkg_linux.conf b/target/livecd/pkg_linux.conf index 1156c6bba..f6ec8d9a9 100644 --- a/target/livecd/pkg_linux.conf +++ b/target/livecd/pkg_linux.conf @@ -3,9 +3,11 @@ echo_status "Customizing for LiveCD Target ..." [ -e $confdir/$pkg.conf ] && . $confdir/$pkg.conf extract_squashfspatch() { - tar --use-compress-program=bzip2 -xOf $base/download/mirror/s/squashfs2.1-fake.tar.bz2 \ - squashfs2.1-fake/linux-${vanilla_ver}/squashfs2.1-patch > $archdir/squashfs2.1.patch + + my_ver=`echo ${vanilla_ver} | sed -e 's,^\(2\.[46]\.[0-9]*\)\(\..*\)$,\1,'` + tar --use-compress-program=bzip2 -xOf $base/download/mirror/s/squashfs2.2-r2.tar.bz2 \ + squashfs2.2-r2/linux-${my_ver}/squashfs2.2-patch > $archdir/squashfs2.2.patch } hook_add prepatch 1 extract_squashfspatch -var_append patchfiles " " "$archdir/squashfs2.1.patch" +var_append patchfiles " " "$archdir/squashfs2.2.patch"