diff options
author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-06 10:15:27 +0100 |
---|---|---|
committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-06 10:15:27 +0100 |
commit | 44b9190fb62a6a09276c765685cc8ddde9cb201f (patch) | |
tree | ac61baa4cf259e02de0ce8f1c7b76b3713f2e257 /recipes/squashfs-tools | |
parent | c994c0a4526e8d7a16fecaceffde4f42ed1f45ff (diff) | |
parent | 35cc93da885ac6d438da6aaed9517e91d4a7e6b3 (diff) |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/squashfs-tools')
-rw-r--r-- | recipes/squashfs-tools/squashfs-tools-native_4.0.bb | 5 | ||||
-rw-r--r-- | recipes/squashfs-tools/squashfs-tools_4.0.bb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb index f21bf99645..8fc80a64f1 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb @@ -1,6 +1,9 @@ +require squashfs-tools_${PV}.bb + inherit native -require squashfs-tools_${PV}.bb +DEPENDS = "zlib-native lzma-native " + PR = "${INC_PR}.1" PACKAGES = "" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index a4503fcf0f..17ab6dc61b 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -7,6 +7,8 @@ EXTRA_OEMAKE = "USE_LZMA=1 \ LZMA_LIB='${STAGING_LIBDIR}/liblzma.a'" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + SRC_URI += " file://portability.patch;patch=1;pnum=2 \ file://lzma-support.patch;patch=1;pnum=2" |