diff options
| -rw-r--r-- | classes/autotools.bbclass | 59 | ||||
| -rw-r--r-- | classes/native.bbclass | 1 | ||||
| -rw-r--r-- | classes/package.bbclass | 3 | ||||
| -rw-r--r-- | packages/db/db-native_4.2.52.bb | 14 | ||||
| -rw-r--r-- | packages/db/db_4.2.52.bb | 2 | ||||
| -rw-r--r-- | packages/gstreamer/gstreamer/po-makefile-fix.patch | 13 | ||||
| -rw-r--r-- | packages/gstreamer/gstreamer_0.10.17.bb | 5 |
7 files changed, 55 insertions, 42 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index a535b046e3..1f03825b92 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -165,6 +165,17 @@ autotools_stage_includes() { fi } +autotools_stage_dir() { + from="$1" + to="$2" + # This will remove empty directories so we can ignore them + rmdir "$from" 2> /dev/null || true + if [ -d "$from" ]; then + mkdir -p "$to" + cp -fpPR -t "$to" "$from"/* + fi +} + autotools_stage_all() { if [ "${INHIBIT_AUTO_STAGE}" = "1" ] then @@ -173,9 +184,13 @@ autotools_stage_all() { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} oe_runmake DESTDIR="${STAGE_TEMP}" install - if [ -d ${STAGE_TEMP}/${includedir} ]; then - mkdir -p ${STAGING_INCDIR} - cp -fpPR -t ${STAGING_INCDIR} ${STAGE_TEMP}/${includedir}/* + autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} + if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then + autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} + autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} + autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} + autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} + autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} fi if [ -d ${STAGE_TEMP}/${libdir} ] then @@ -200,41 +215,9 @@ autotools_stage_all() { cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} fi fi - - #This will remove an empty directory so we can ignore it - rmdir ${STAGE_TEMP}/${datadir} || true - if [ -d ${STAGE_TEMP}/${datadir} ]; then - install -d ${STAGING_DATADIR}/ - cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/ - fi - - if [ "${AUTOTOOLS_NATIVE_STAGE_BINARIES}" = "1" ] ; then - #This will remove an empty directory so we can ignore it - rmdir ${STAGE_TEMP}/${bindir} || true - if [ -d ${STAGE_TEMP}/${bindir} ]; then - mkdir -p ${STAGING_DIR_HOST}${layout_bindir} - cp -fpPR -t ${STAGING_DIR_HOST}/${layout_bindir} ${STAGE_TEMP}/${bindir}/* - fi - #This will remove an empty directory so we can ignore it - rmdir ${STAGE_TEMP}/${sbindir} || true - if [ -d ${STAGE_TEMP}/${sbindir} ]; then - mkdir -p ${STAGING_DIR_HOST}${layout_sbindir} - cp -fpPR -t ${STAGING_DIR_HOST}/${layout_sbindir} ${STAGE_TEMP}/${sbindir}/* - fi - #This will remove an empty directory so we can ignore it - rmdir ${STAGE_TEMP}/${base_bindir} || true - if [ -d ${STAGE_TEMP}/${base_bindir} ]; then - mkdir -p ${STAGING_DIR_HOST}${layout_base_bindir} - cp -fpPR -t ${STAGING_DIR_HOST}/${layout_base_bindir} ${STAGE_TEMP}/${base_bindir}/* - fi - #This will remove an empty directory so we can ignore it - rmdir ${STAGE_TEMP}/${base_sbindir} || true - if [ -d ${STAGE_TEMP}/${base_sbindir} ]; then - mkdir -p ${STAGING_DIR_HOST}${layout_base_sbindir} - cp -fpPR -t ${STAGING_DIR_HOST}/${layout_nase_sbindir} ${STAGE_TEMP}/${base_sbindir}/* - fi - - fi + rm -rf ${STAGE_TEMP}/${mandir} || true + rm -rf ${STAGE_TEMP}/${infodir} || true + autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR} rm -rf ${STAGE_TEMP} } diff --git a/classes/native.bbclass b/classes/native.bbclass index 43c71e16cf..4022cb09c0 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -80,7 +80,6 @@ do_stage () { then oe_runmake install else - export AUTOTOOLS_NATIVE_STAGE_BINARIES="1" autotools_stage_all fi fi diff --git a/classes/package.bbclass b/classes/package.bbclass index 3177965b18..eb43856c55 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -490,6 +490,8 @@ python emit_pkgdata() { for pkg in packages.split(): subdata_file = pkgdatadir + "/runtime/%s" % pkg sf = open(subdata_file, 'w') + write_if_exists(sf, pkg, 'PN') + write_if_exists(sf, pkg, 'PR') write_if_exists(sf, pkg, 'DESCRIPTION') write_if_exists(sf, pkg, 'RDEPENDS') write_if_exists(sf, pkg, 'RPROVIDES') @@ -497,7 +499,6 @@ python emit_pkgdata() { write_if_exists(sf, pkg, 'RSUGGESTS') write_if_exists(sf, pkg, 'RREPLACES') write_if_exists(sf, pkg, 'RCONFLICTS') - write_if_exists(sf, pkg, 'PR') write_if_exists(sf, pkg, 'PKG') write_if_exists(sf, pkg, 'ALLOW_EMPTY') write_if_exists(sf, pkg, 'FILES') diff --git a/packages/db/db-native_4.2.52.bb b/packages/db/db-native_4.2.52.bb index 12a875ff13..567ddffb75 100644 --- a/packages/db/db-native_4.2.52.bb +++ b/packages/db/db-native_4.2.52.bb @@ -11,3 +11,17 @@ inherit native require db_${PV}.bb PACKAGES = "" + +do_stage() { + # The .h files get installed read-only, the autostage + # function just uses cp -pPR, so do this by hand + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install_include + cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/. + rm -rf ${STAGE_TEMP} + oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR} + ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so + ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a +} + diff --git a/packages/db/db_4.2.52.bb b/packages/db/db_4.2.52.bb index a0c394f7a4..94d875e2cd 100644 --- a/packages/db/db_4.2.52.bb +++ b/packages/db/db_4.2.52.bb @@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r6" +PR = "r7" SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" diff --git a/packages/gstreamer/gstreamer/po-makefile-fix.patch b/packages/gstreamer/gstreamer/po-makefile-fix.patch new file mode 100644 index 0000000000..774c21c189 --- /dev/null +++ b/packages/gstreamer/gstreamer/po-makefile-fix.patch @@ -0,0 +1,13 @@ +Index: gstreamer-0.10.17/po/Makefile.in.in +=================================================================== +--- gstreamer-0.10.17.orig/po/Makefile.in.in 2008-01-25 23:21:31.000000000 +0800 ++++ gstreamer-0.10.17/po/Makefile.in.in 2008-03-20 19:10:54.000000000 +0800 +@@ -30,7 +30,7 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` ++mkinstalldirs = $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ diff --git a/packages/gstreamer/gstreamer_0.10.17.bb b/packages/gstreamer/gstreamer_0.10.17.bb index 9e9ae62cb1..b2e5daf671 100644 --- a/packages/gstreamer/gstreamer_0.10.17.bb +++ b/packages/gstreamer/gstreamer_0.10.17.bb @@ -1,3 +1,6 @@ require gstreamer.inc -PR = "r0" +PR = "r1" + +SRC_URI += "file://po-makefile-fix.patch;patch=1" + |