mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

libpng: clean up FILE after PACKAGE reorder

Browse Source 
(From OE-Core rev: 3fddd5314b51946f9b02760ca7d847bb3107fefa)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2012-06-05 05:47:02 -07:00
committed by Richard Purdie
parent fbe245a974
commit 28b6b281d3
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/elfutils/elfutils_0.148.bb
+8 -4
View File
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\
file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417" file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417"
DEPENDS = "libtool bzip2 zlib" DEPENDS = "libtool bzip2 zlib"
PR = "r7" PR = "r8"
SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2" SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"
@@ -74,8 +74,12 @@ FILES_${PN}-binutils = "\
${bindir}/eu-readelf \ ${bindir}/eu-readelf \
${bindir}/eu-size \ ${bindir}/eu-size \
${bindir}/eu-strip" ${bindir}/eu-strip"
# Fix library issues
FILES_${PN} =+ "${libdir}/*-${PV}.so"
# The elfutils package contains symlinks that trip up insane # Some packages have the version preceeding the .so instead properly
# versioned .so.<version>, so we need to reorder and repackage.
FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
FILES_SOLIBSDEV = "${libdir}/libasm.so ${libdir}/libdw.so ${libdir}/libelf.so"
# The package contains symlinks that trip up insane
INSANE_SKIP_${PN} = "dev-so" INSANE_SKIP_${PN} = "dev-so"
meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
+4 -2
View File
@@ -14,7 +14,7 @@ BBCLASSEXTEND = "native nativesdk"
#FIXME: remove the following #FIXME: remove the following
ARM_INSTRUCTION_SET = "arm" ARM_INSTRUCTION_SET = "arm"
PR = "r1" PR = "r2"
SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
file://fix-tstamp-declaration.patch" file://fix-tstamp-declaration.patch"
@@ -35,7 +35,9 @@ PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk" PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}" PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}"
FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" FILES_${PN} += "${libdir}/${BPN}/smixer/*.so"
FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug"
FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la"
FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*" FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*"
FILES_alsa-server${PKGSUFFIX} = "${bindir}/*" FILES_alsa-server${PKGSUFFIX} = "${bindir}/*"
FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/" FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/"
meta/recipes-multimedia/libpng/libpng_1.2.49.bb
+1 -3
View File
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
LIC_FILES_CHKSUM = "file://LICENSE;md5=20110633230abd47fe8680afa75f1492 \ LIC_FILES_CHKSUM = "file://LICENSE;md5=20110633230abd47fe8680afa75f1492 \
file://png.h;startline=308;endline=422;md5=edd1c552386a8c3773d90e278ae30891" file://png.h;startline=308;endline=422;md5=edd1c552386a8c3773d90e278ae30891"
DEPENDS = "zlib" DEPENDS = "zlib"
PR = "r0" PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
@@ -18,8 +18,6 @@ inherit autotools binconfig pkgconfig
PACKAGES =+ "${PN}12" PACKAGES =+ "${PN}12"
FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dev += " ${bindir} ${sbindir}"
RPROVIDES_${PN}-dev += "${PN}12-dev" RPROVIDES_${PN}-dev += "${PN}12-dev"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"