summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-07 21:03:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-08 20:12:06 (GMT)
commit10d6c4e056b4c3333f15e442af4283c99e5951e2 (patch)
treef820e14de6c3c657dfa53a5995de8f90fe07ebf7
parentc6bb463995db745d1a4c55cac324e201deef2413 (diff)
downloadpoky-10d6c4e056b4c3333f15e442af4283c99e5951e2.tar.gz
bzip2: split into binary and library packages
* Create libbz2 (and -dev, -staticdev), which can be installed without the bzip2 executables. (From OE-Core rev: e27af1f273e9a7348dd8f5542df9206acd9210f3) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb2
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc2
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.148.bb2
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.51.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb2
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.6.bb14
-rw-r--r--meta/recipes-support/gnupg/gnupg_1.4.7.bb2
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.0.18.bb1
-rw-r--r--meta/recipes-support/libpcre/libpcre_8.21.bb2
9 files changed, 21 insertions, 8 deletions
diff --git a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
index bf1b1ad..01139c7 100644
--- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
+++ b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "GNOME Structured File Library" 1DESCRIPTION = "GNOME Structured File Library"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "libs" 3SECTION = "libs"
4PR = "r2" 4PR = "r3"
5 5
6LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
7 file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \ 7 file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 1326994..69fd50a 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPLv2.0+" 2LICENSE = "GPLv2.0+"
3SECTION = "base" 3SECTION = "base"
4 4
5INC_PR = "r15" 5INC_PR = "r16"
6 6
7SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \ 7SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
8 file://ignore_extra_fields.patch" 8 file://ignore_extra_fields.patch"
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 710959a..dca89b1 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\
6 file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417" 6 file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417"
7DEPENDS = "libtool bzip2 zlib" 7DEPENDS = "libtool bzip2 zlib"
8 8
9PR = "r5" 9PR = "r6"
10 10
11SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2" 11SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"
12 12
diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb
index 6691d15..1c6ca73 100644
--- a/meta/recipes-devtools/quilt/quilt_0.51.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.51.bb
@@ -4,4 +4,4 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
4SRC_URI += "file://aclocal.patch \ 4SRC_URI += "file://aclocal.patch \
5 file://gnu_patch_test_fix_target.patch \ 5 file://gnu_patch_test_fix_target.patch \
6 " 6 "
7PR = "r0" 7PR = "r1"
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 6be490f..64ae537 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" 45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
46extrarpmdeps = "python perl" 46extrarpmdeps = "python perl"
47extrarpmdeps_virtclass-native = "file-native" 47extrarpmdeps_virtclass-native = "file-native"
48PR = "r31" 48PR = "r32"
49 49
50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
51# in order to extract the distribution SRPM into a format we can extract... 51# in order to extract the distribution SRPM into a format we can extract...
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index 14cd240..fa8310e 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.bzip.org/"
6SECTION = "console/utils" 6SECTION = "console/utils"
7LICENSE = "BSD-4-Clause" 7LICENSE = "BSD-4-Clause"
8LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" 8LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2"
9PR = "r4" 9PR = "r5"
10 10
11SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \ 11SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \
12 file://configure.ac \ 12 file://configure.ac \
@@ -15,6 +15,8 @@ SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \
15SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b" 15SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b"
16SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd" 16SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
17 17
18PACKAGES =+ "libbz2 libbz2-dev libbz2-staticdev"
19
18CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" 20CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
19 21
20inherit autotools update-alternatives 22inherit autotools update-alternatives
@@ -28,5 +30,15 @@ do_configure_prepend () {
28 cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/ 30 cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/
29} 31}
30 32
33FILES_libbz2 = "${libdir}/lib*${SOLIBS}"
34
35FILES_libbz2-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
36SECTION_libbz2-dev = "devel"
37RDEPENDS_libbz2-dev = "libbz2 (= ${EXTENDPKGV})"
38
39FILES_libbz2-staticdev = "${libdir}/*.a"
40SECTION_libbz2-staticdev = "devel"
41RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})"
42
31PROVIDES_append_virtclass-native = " bzip2-full-native" 43PROVIDES_append_virtclass-native = " bzip2-full-native"
32BBCLASSEXTEND = "native" 44BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/meta/recipes-support/gnupg/gnupg_1.4.7.bb
index f033659..41552b2 100644
--- a/meta/recipes-support/gnupg/gnupg_1.4.7.bb
+++ b/meta/recipes-support/gnupg/gnupg_1.4.7.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
7 7
8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
9 9
10PR = "r5" 10PR = "r6"
11 11
12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
13 file://long-long-thumb.patch \ 13 file://long-long-thumb.patch \
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index abcb5fb..3085494 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
5 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" 5 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
6 6
7DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt" 7DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
8PR = "r1"
8 9
9inherit autotools gettext 10inherit autotools gettext
10 11
diff --git a/meta/recipes-support/libpcre/libpcre_8.21.bb b/meta/recipes-support/libpcre/libpcre_8.21.bb
index f48d9f2..f5fa4ef 100644
--- a/meta/recipes-support/libpcre/libpcre_8.21.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.21.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
5themselves still follow Perl syntax and semantics. The header file for \ 5themselves still follow Perl syntax and semantics. The header file for \
6the POSIX-style functions is called pcreposix.h." 6the POSIX-style functions is called pcreposix.h."
7SECTION = "devel" 7SECTION = "devel"
8PR = "r0" 8PR = "r1"
9LICENSE = "BSD" 9LICENSE = "BSD"
10LIC_FILES_CHKSUM = "file://LICENCE;md5=2f00d186a775c8002422a5315079d96b" 10LIC_FILES_CHKSUM = "file://LICENCE;md5=2f00d186a775c8002422a5315079d96b"
11SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \