[oe-commits] Marcin Juszkiewicz : file: merged Poky changes (BBEXTENDCLASS + new staging )
git version control
git at git.openembedded.org
Tue Mar 2 17:39:47 UTC 2010
Module: openembedded.git
Branch: shr/unstable
Commit: e329d5e021ecc3484660f6b8beab44a837913897
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e329d5e021ecc3484660f6b8beab44a837913897
Author: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
Date: Mon Mar 1 15:58:18 2010 +0100
file: merged Poky changes (BBEXTENDCLASS + new staging)
Note that 5.04 (newest) is now default instead of 4.21.
Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
---
recipes/file/file-native_4.18.bb | 8 --------
recipes/file/file-native_4.21.bb | 6 ------
recipes/file/file_4.18.bb | 15 ++++-----------
recipes/file/file_4.21.bb | 17 ++++++-----------
recipes/file/file_5.04.bb | 13 ++-----------
5 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/recipes/file/file-native_4.18.bb b/recipes/file/file-native_4.18.bb
deleted file mode 100644
index 63554b0..0000000
--- a/recipes/file/file-native_4.18.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require file_${PV}.bb
-inherit native
-
-# avoid dependency loop
-DEPENDS = ""
-PR = "r1"
-
-SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/recipes/file/file-native_4.21.bb b/recipes/file/file-native_4.21.bb
deleted file mode 100644
index 734891d..0000000
--- a/recipes/file/file-native_4.21.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require file_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-PR = "r0"
-
-SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/recipes/file/file_4.18.bb b/recipes/file/file_4.18.bb
index a98c680..5433d3e 100644
--- a/recipes/file/file_4.18.bb
+++ b/recipes/file/file_4.18.bb
@@ -1,22 +1,15 @@
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-SECTION = "console/utils"
-LICENSE = "BSD-ADV"
-DEPENDS = "file-native"
+require file.inc
+
+PR = "${INCPR}.0"
SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
file://dump \
file://filesystems"
-S = "${WORKDIR}/file-${PV}"
-inherit autotools
+SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1"
do_configure_prepend() {
sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
cp ${WORKDIR}/dump ${S}/magic/Magdir/
cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
}
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/recipes/file/file_4.21.bb b/recipes/file/file_4.21.bb
index 758f7f3..dfe6e10 100644
--- a/recipes/file/file_4.21.bb
+++ b/recipes/file/file_4.21.bb
@@ -1,18 +1,13 @@
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-SECTION = "console/utils"
-LICENSE = "BSD-ADV"
-DEPENDS = "file-native"
+require file.inc
+
+DEPENDS_virtclass-native += "zlib-native"
+
+PR = "${INCPR}.0"
SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
-S = "${WORKDIR}/file-${PV}"
-inherit autotools
+SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1"
do_configure_prepend() {
sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
}
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/recipes/file/file_5.04.bb b/recipes/file/file_5.04.bb
index 1fe1488..da14e94 100644
--- a/recipes/file/file_5.04.bb
+++ b/recipes/file/file_5.04.bb
@@ -1,12 +1,3 @@
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-SECTION = "console/utils"
-LICENSE = "BSD-ADV"
-DEPENDS = "file-native"
-DEPENDS_virtclass-native = ""
+require file.inc
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz"
-
-inherit autotools
-
-BBCLASSEXTEND = "native"
+PR = "${INCPR}.0"
More information about the Openembedded-commits
mailing list