From 814380b028a9cf4e069a149ed1140eaae2234dcb Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 5 Jan 2014 11:41:23 +0100
Subject: [PATCH] squashfs: convert to new package format, move package

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../meta => sysutils/squashfs/package.mk}     | 22 +++++++++---
 .../patches/squashfs-4.2-defaults-0.1.patch   |  0
 .../patches/squashfs-4.2-gzip_fix.patch       |  0
 packages/toolchain/sysutils/squashfs/build    | 34 -------------------
 scripts/image                                 |  2 +-
 5 files changed, 18 insertions(+), 40 deletions(-)
 rename packages/{toolchain/sysutils/squashfs/meta => sysutils/squashfs/package.mk} (81%)
 rename packages/{toolchain => }/sysutils/squashfs/patches/squashfs-4.2-defaults-0.1.patch (100%)
 rename packages/{toolchain => }/sysutils/squashfs/patches/squashfs-4.2-gzip_fix.patch (100%)
 delete mode 100755 packages/toolchain/sysutils/squashfs/build

diff --git a/packages/toolchain/sysutils/squashfs/meta b/packages/sysutils/squashfs/package.mk
similarity index 81%
rename from packages/toolchain/sysutils/squashfs/meta
rename to packages/sysutils/squashfs/package.mk
index 742033cb07..b9dcf53e3f 100644
--- a/packages/toolchain/sysutils/squashfs/meta
+++ b/packages/sysutils/squashfs/package.mk
@@ -23,14 +23,26 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://squashfs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/squashfs/squashfs/${PKG_NAME}${PKG_VERSION}/${PKG_NAME}${PKG_VERSION}.tar.gz"
-#PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_SOURCE_DIR="${PKG_NAME}${PKG_VERSION}"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache zlib:host lzo:host xz"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache zlib:host lzo:host xz"
 PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/sysutils"
+PKG_SECTION="sysutils"
 PKG_SHORTDESC="squashfs-tools: A compressed read-only filesystem for Linux"
 PKG_LONGDESC="Squashfs is intended to be a general read-only filesystem, for archival use (i.e. in cases where a .tar.gz file may be used), and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed. The filesystem is currently stable and has been tested on PowerPC, i386, SPARC and ARM architectures."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+export LDFLAGS="$LDFLAGS -fwhole-program"
+
+make_host() {
+  make -C squashfs-tools mksquashfs \
+       XZ_SUPPORT=1 LZO_SUPPORT=1 \
+       INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include"
+}
+
+makeinstall_host() {
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+    cp squashfs-tools/mksquashfs $ROOT/$TOOLCHAIN/bin
+}
diff --git a/packages/toolchain/sysutils/squashfs/patches/squashfs-4.2-defaults-0.1.patch b/packages/sysutils/squashfs/patches/squashfs-4.2-defaults-0.1.patch
similarity index 100%
rename from packages/toolchain/sysutils/squashfs/patches/squashfs-4.2-defaults-0.1.patch
rename to packages/sysutils/squashfs/patches/squashfs-4.2-defaults-0.1.patch
diff --git a/packages/toolchain/sysutils/squashfs/patches/squashfs-4.2-gzip_fix.patch b/packages/sysutils/squashfs/patches/squashfs-4.2-gzip_fix.patch
similarity index 100%
rename from packages/toolchain/sysutils/squashfs/patches/squashfs-4.2-gzip_fix.patch
rename to packages/sysutils/squashfs/patches/squashfs-4.2-gzip_fix.patch
diff --git a/packages/toolchain/sysutils/squashfs/build b/packages/toolchain/sysutils/squashfs/build
deleted file mode 100755
index 70b9712d07..0000000000
--- a/packages/toolchain/sysutils/squashfs/build
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-setup_toolchain host
-
-LDFLAGS="$LDFLAGS -fwhole-program"
-
-cd $BUILD/$1*/squashfs-tools
-make mksquashfs \
-     XZ_SUPPORT=1 \
-     LZO_SUPPORT=1 \
-     INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include"
-
-mkdir -p $ROOT/$TOOLCHAIN/bin
-  cp mksquashfs $ROOT/$TOOLCHAIN/bin
diff --git a/scripts/image b/scripts/image
index bbcdd20913..b60286978e 100755
--- a/scripts/image
+++ b/scripts/image
@@ -24,7 +24,7 @@ show_config
 
 $SCRIPTS/checkdeps build
 $SCRIPTS/build toolchain
-$SCRIPTS/build squashfs
+$SCRIPTS/build squashfs:host
 $SCRIPTS/build fakeroot
 $SCRIPTS/build kmod:host