From c5a493684671da97761bf3db53be386e75a1990c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 15:54:30 -0700 Subject: [PATCH] squashfs-tools: Switch to BBCLASSEXTEND, drop legacy staging, bump PR Signed-off-by: Tom Rini --- recipes/squashfs-tools/squashfs-tools-native_3.3.bb | 10 ---------- recipes/squashfs-tools/squashfs-tools-native_4.0.bb | 12 ------------ recipes/squashfs-tools/squashfs-tools.inc | 5 ++++- recipes/squashfs-tools/squashfs-tools_3.3.bb | 2 +- recipes/squashfs-tools/squashfs-tools_4.0.bb | 2 +- 5 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 recipes/squashfs-tools/squashfs-tools-native_3.3.bb delete mode 100644 recipes/squashfs-tools/squashfs-tools-native_4.0.bb diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb deleted file mode 100644 index 1a82323951..0000000000 --- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require squashfs-tools_${PV}.bb -PR = "${INC_PR}.1" - -inherit native - -PACKAGES = "" - -do_stage () { - install -m 0755 mksquashfs ${STAGING_BINDIR}/ -} diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb deleted file mode 100644 index 17894179f2..0000000000 --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require squashfs-tools_4.0.bb - -inherit native - -DEPENDS = "attr-native zlib-native" - -PACKAGES = "" - -do_stage () { - install -m 0755 mksquashfs ${STAGING_BINDIR}/ -} - diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc index a1f778d3d5..ceb02562a3 100644 --- a/recipes/squashfs-tools/squashfs-tools.inc +++ b/recipes/squashfs-tools/squashfs-tools.inc @@ -2,10 +2,13 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." SECTION = "base" LICENSE = "GPLv2" DEPENDS = "attr zlib" -INC_PR = "r4" +INC_PR = "r5" S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" + # required to share same place with -lzma specific packages FILESPATHPKG =. "squashfs-tools-${PV}:" diff --git a/recipes/squashfs-tools/squashfs-tools_3.3.bb b/recipes/squashfs-tools/squashfs-tools_3.3.bb index 7883ca140d..fd2783f7b4 100644 --- a/recipes/squashfs-tools/squashfs-tools_3.3.bb +++ b/recipes/squashfs-tools/squashfs-tools_3.3.bb @@ -1,4 +1,4 @@ require squashfs-tools.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" SRC_URI += " file://Makefile.patch" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index cf33c0d163..b476dc43e4 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -6,7 +6,7 @@ SRC_URI = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module SRC_URI += " file://Makefile.patch" require squashfs-tools.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.0" S = "${WORKDIR}/squashfs/squashfs-tools" -- 2.11.4.GIT