[oe-commits] org.oe.dev merge of '80401af978389dc31680f5749d9a6b066bbee542'
rpurdie commit
openembedded-commits at lists.openembedded.org
Sat Dec 1 23:30:40 UTC 2007
merge of '80401af978389dc31680f5749d9a6b066bbee542'
and 'eb184b297334b4fd07df0787e5149d8be2c97b65'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: fe257dd745721f1280a74401ebb57a30f64581b2
ViewMTN: http://monotone.openembedded.org/revision/info/fe257dd745721f1280a74401ebb57a30f64581b2
Files:
1
packages/libtool/libtool-1.5.10/tag1.patch
packages/git/git-native_1.5.3.bb
packages/git/git.inc
packages/libtool/libtool-1.5.10/libdir-la2.patch
site/arm-darwin
classes/base.bbclass
classes/cross.bbclass
classes/debian.bbclass
classes/package.bbclass
classes/siteinfo.bbclass
conf/bitbake.conf
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool_1.5.10.bb
packages/meta/meta-toolchain.bb
packages/shasum/shasum-native.bb
packages/stage-manager/files/stage-manager
packages/stage-manager/stagemanager-native_0.0.1.bb
packages/x11vnc/x11vnc_0.9.3.bb
site/common-glibc
packages/tasks/task-boot.bb
Diffs:
#
# mt diff -r80401af978389dc31680f5749d9a6b066bbee542 -rfe257dd745721f1280a74401ebb57a30f64581b2
#
#
#
# delete "packages/libtool/libtool-1.5.10/tag1.patch"
#
# add_file "packages/git/git-native_1.5.3.bb"
# content [0eee3955b85d6ba2bd393cc5e7525c848366f62c]
#
# add_file "packages/git/git.inc"
# content [ce7e34b4dd8490461c6e668e1fc0f228df6a0f62]
#
# add_file "packages/libtool/libtool-1.5.10/libdir-la2.patch"
# content [d1963c450f45aec334ceb0c17f3a8beeb5f990df]
#
# add_file "site/arm-darwin"
# content [000e65302e528d3c33819d531644b3142ca15c92]
#
# patch "classes/base.bbclass"
# from [d94e4a54d0b01a3d7a66b2c418f28f37616379ab]
# to [a42a0cea14f8090cf64528a459fa8b5795e36327]
#
# patch "classes/cross.bbclass"
# from [8ef5df86820dc67931c8ddb72f1fe303ee04f0b8]
# to [504bbe85b9aae389cdf483045310b7f26d7a5fb4]
#
# patch "classes/debian.bbclass"
# from [3faf23c6fd98ff2bd435268edd5e503953d4eef5]
# to [2a365d85a6678f446949df94f9e76dad1677e376]
#
# patch "classes/package.bbclass"
# from [5d45a61dc3bb51e27788fa8ef8316543e655f7d6]
# to [64623cb5ec9aca92b3faacf2075e146fcce623d9]
#
# patch "classes/siteinfo.bbclass"
# from [12a7c72c9a63a94e4f6bc81705c78b04597df2a7]
# to [ad8a25b8d98422ba10f5dd64a960dccedae4f42f]
#
# patch "conf/bitbake.conf"
# from [296476eab302b3db132347510f665c6d65f38712]
# to [a1f6c5d6d3d4d66c93aa695c408f6bd53a242eb4]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [ea1ba26d91260c163e077eaf1ce72502cb22d75c]
# to [54bc11a40b3ffda524161118db81f8521ce06a24]
#
# patch "packages/libtool/libtool-native_1.5.10.bb"
# from [3db44cdc921e61d2528664266cd0eda2cbf4d430]
# to [1637e2be734e54d7a59c21c3b10070585210ca96]
#
# patch "packages/libtool/libtool_1.5.10.bb"
# from [a09ef5ec1049aa5911eaaeb30a1d607825a17d58]
# to [4e7a487d5beec4d7a20adea55794f9747fd8ab75]
#
# patch "packages/meta/meta-toolchain.bb"
# from [5ede0ab68d89b645b8a529a7753ba969648d4bb0]
# to [6a7cecb31e297844a67f19888a2e7489e81d948c]
#
# patch "packages/shasum/shasum-native.bb"
# from [b95046276d5dbfc6a4b6ddf7caeb118f40eb4edd]
# to [ec69cdeaa4425bd2cd8dd606873c4834474b0465]
#
# patch "packages/stage-manager/files/stage-manager"
# from [1368a040e4fc6b8a70a83f348cacf1c31683f7cf]
# to [fb9aad832b3e02894ec5c57f49b3de656987cd54]
#
# patch "packages/stage-manager/stagemanager-native_0.0.1.bb"
# from [2c67701cd33fc4fa2760a291fa2337c04e3420cd]
# to [3c3bbddbeddf23d86eb06dd0518a8e7c5185345c]
#
# patch "packages/x11vnc/x11vnc_0.9.3.bb"
# from [b96331abea630fdec35fc060d5a57913a178461a]
# to [aa732c8e4a44358ecadf82dfb92bfb011ab2bd20]
#
# patch "site/common-glibc"
# from [6805917425c88e6085e0d4ddc9881ab19e272e62]
# to [4405815e133a050b155173bd66db32480d6feae1]
#
============================================================
--- packages/git/git-native_1.5.3.bb 0eee3955b85d6ba2bd393cc5e7525c848366f62c
+++ packages/git/git-native_1.5.3.bb 0eee3955b85d6ba2bd393cc5e7525c848366f62c
@@ -0,0 +1,4 @@
+require git.inc
+inherit native
+DEPENDS = "openssl-native curl-native zlib-native expat-native"
+PR = "r1"
============================================================
--- packages/git/git.inc ce7e34b4dd8490461c6e668e1fc0f228df6a0f62
+++ packages/git/git.inc ce7e34b4dd8490461c6e668e1fc0f228df6a0f62
@@ -0,0 +1,19 @@
+DESCRIPTION = "The git revision control system used by the Linux kernel developers"
+SECTION = "console/utils"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
+ file://autotools.patch;patch=1"
+S = "${WORKDIR}/git-${PV}"
+
+EXTRA_OEMAKE = "NO_TCLTL=1"
+
+inherit autotools
+
+do_install () {
+ oe_runmake install prefix=${D} bindir=${D}${bindir} \
+ template_dir=${D}${datadir}/git-core/templates \
+ GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+}
+
+FILES_${PN} += "${datadir}/git-core"
============================================================
--- packages/libtool/libtool-1.5.10/libdir-la2.patch d1963c450f45aec334ceb0c17f3a8beeb5f990df
+++ packages/libtool/libtool-1.5.10/libdir-la2.patch d1963c450f45aec334ceb0c17f3a8beeb5f990df
@@ -0,0 +1,64 @@
+OE changes to installed=no which means we can't run the original test
+and just look in $objdir. We therefore look in both, preferring
+$objdir if it exists - RP 29/11/2007
+
+--- libtool-1.5.10/ltmain.in.orig
++++ libtool-1.5.10/ltmain.in
+@@ -3105,8 +3105,11 @@
+ fi
+ ;;
+ esac
+- if grep "^installed=no" $deplib > /dev/null; then
+- path="$absdir/$objdir"
++# OE changes to installed=no which means we can't run the original test
++# and just look in $objdir. We therefore look in both, preferring
++# $objdir if it exists, see below. - RP 29/11/2007
++# if grep "^installed=no" $deplib > /dev/null; then
++# path="$absdir/$objdir"
+ # This interferes with crosscompilation. -CL
+ # else
+ # eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -3117,7 +3120,7 @@
+ # if test "$absdir" != "$libdir"; then
+ # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ # fi
+- else
++ if ! grep "^installed=no" $deplib > /dev/null; then
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+@@ -3138,9 +3141,17 @@
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
+- depdepl="$path/$depdepl"
++
++ if test -f "$absdir/$objdir/$depdepl" ; then
++ depdepl="$absdir/$objdir/$depdepl"
++ path="$absdir/$objdir"
++ elif test -f "$absdir/$depdepl" ; then
++ depdepl="$absdir/$depdepl"
++ path="$absdir"
++ else
++ path="$absdir/$objdir"
+ fi
++
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+@@ -3150,7 +3161,13 @@
+ path=""
+ ;;
+ *)
+- path="-L$path"
++ if test -d "$absdir/$objdir" ; then
++ path="-L$absdir/$objdir"
++ elif test -d "$absdir" ; then
++ path="-L$absdir"
++ else
++ path="-L$absdir/$objdir"
++ fi
+ ;;
+ esac
+ ;;
============================================================
--- site/arm-darwin 000e65302e528d3c33819d531644b3142ca15c92
+++ site/arm-darwin 000e65302e528d3c33819d531644b3142ca15c92
@@ -0,0 +1,5 @@
+ac_cv_lib_m_sin=${ac_cv_lib_m_sin=yes}
+ac_cv_func_posix_spawn=${ac_cv_func_posix_spawn=no}
+glib_cv_stack_grows=${glib_cv_stack_grows=no}
+glib_cv_uscore=${glib_cv_uscore=no}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
============================================================
--- classes/base.bbclass d94e4a54d0b01a3d7a66b2c418f28f37616379ab
+++ classes/base.bbclass a42a0cea14f8090cf64528a459fa8b5795e36327
@@ -315,7 +315,9 @@ oe_libinstall() {
# stop libtool using the final directory name for libraries
# in staging:
__runcmd rm -f $destpath/$libname.la
- __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
+ __runcmd sed -e 's/^installed=yes$/installed=no/' \
+ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+ $dotlai >$destpath/$libname.la
else
__runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
@@ -702,7 +704,7 @@ python do_populate_staging () {
addtask populate_staging after do_install
python do_populate_staging () {
- bb.build.exec_func('do_stage', d)
+ bb.build.exec_func('do_stage', d)
}
addtask install after do_compile
@@ -744,7 +746,7 @@ def packaged(pkg, d):
def packaged(pkg, d):
import os, bb
- return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
+ return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK)
def read_pkgdatafile(fn):
pkgdata = {}
@@ -768,17 +770,24 @@ def read_pkgdatafile(fn):
return pkgdata
+def get_subpkgedata_fn(pkg, d):
+ import bb, os
+ archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
+ archs.reverse()
+ for arch in archs:
+ fn = bb.data.expand('${STAGING_DIR}/pkgdata/' + arch + '${TARGET_VENDOR}-${TARGET_OS}/runtime/%s' % pkg, d)
+ if os.path.exists(fn):
+ return fn
+ return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
+
def has_subpkgdata(pkg, d):
import bb, os
- fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
- return os.access(fn, os.R_OK)
+ return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
def read_subpkgdata(pkg, d):
import bb, os
- fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
- return read_pkgdatafile(fn)
+ return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
-
def has_pkgdata(pn, d):
import bb, os
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
============================================================
--- classes/cross.bbclass 8ef5df86820dc67931c8ddb72f1fe303ee04f0b8
+++ classes/cross.bbclass 504bbe85b9aae389cdf483045310b7f26d7a5fb4
@@ -20,6 +20,8 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBD
LDFLAGS = "${BUILD_LDFLAGS}"
LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
+TOOLCHAIN_OPTIONS = ""
+
# Overrides for paths
# Path prefixes
============================================================
--- classes/debian.bbclass 3faf23c6fd98ff2bd435268edd5e503953d4eef5
+++ classes/debian.bbclass 2a365d85a6678f446949df94f9e76dad1677e376
@@ -1,5 +1,3 @@
-STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian"
-
# Debian package renaming only occurs when a package is built
# We therefore have to make sure we build all runtime packages
# before building the current package to make the packages runtime
============================================================
--- classes/package.bbclass 5d45a61dc3bb51e27788fa8ef8316543e655f7d6
+++ classes/package.bbclass 64623cb5ec9aca92b3faacf2075e146fcce623d9
@@ -34,9 +34,6 @@ def do_split_packages(d, root, file_rege
return
packages = bb.data.getVar('PACKAGES', d, 1).split()
- if not packages:
- # nothing to do
- return
if postinst:
postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -189,42 +186,15 @@ def runstrip(file, d):
# Package data handling routines
#
-STAGING_PKGMAPS_DIR ?= "${STAGING_DIR}/pkgmaps"
-
-def add_package_mapping (pkg, new_name, d):
- import bb, os
-
- def encode(str):
- import codecs
- c = codecs.getencoder("string_escape")
- return c(str)[0]
-
- pmap_dir = bb.data.getVar('STAGING_PKGMAPS_DIR', d, 1)
-
- bb.mkdirhier(pmap_dir)
-
- data_file = os.path.join(pmap_dir, pkg)
-
- f = open(data_file, 'w')
- f.write("%s\n" % encode(new_name))
- f.close()
-
def get_package_mapping (pkg, d):
import bb, os
- def decode(str):
- import codecs
- c = codecs.getdecoder("string_escape")
- return c(str)[0]
+ data = read_subpkgdata(pkg, d)
+ key = "PKG_%s" % pkg
- data_file = bb.data.expand("${STAGING_PKGMAPS_DIR}/%s" % pkg, d)
+ if key in data:
+ return data[key]
- if os.access(data_file, os.R_OK):
- f = file(data_file, 'r')
- lines = f.readlines()
- f.close()
- for l in lines:
- return decode(l).strip()
return pkg
def runtime_mapping_rename (varname, d):
@@ -258,9 +228,6 @@ python package_do_split_locales() {
return
packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
- if not packages:
- bb.debug(1, "no packages to build; not splitting locales")
- return
datadir = bb.data.getVar('datadir', d, 1)
if not datadir:
@@ -410,9 +377,6 @@ python populate_packages () {
bb.mkdirhier(dvar)
packages = bb.data.getVar('PACKAGES', d, 1)
- if not packages:
- bb.debug(1, "PACKAGES not defined, nothing to package")
- return
pn = bb.data.getVar('PN', d, 1)
if not pn:
@@ -516,8 +480,6 @@ python populate_packages () {
pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
if pkgname is None:
bb.data.setVar('PKG_%s' % pkg, pkg, d)
- else:
- add_package_mapping(pkg, pkgname, d)
dangling_links = {}
pkg_files = {}
@@ -604,6 +566,8 @@ python emit_pkgdata() {
sf.close()
allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
+ if not allow_empty:
+ allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
root = "%s/install/%s" % (workdir, pkg)
os.chdir(root)
g = glob('*')
@@ -903,11 +867,8 @@ python package_depchains() {
prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
- def packaged(pkg, d):
- return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
+ #bb.note('rdepends for %s is %s' % (base, rdepends))
- #bb.note('rdepends for %s is %s' % (base, rdepends))
-
rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
for depend in rdepends:
============================================================
--- classes/siteinfo.bbclass 12a7c72c9a63a94e4f6bc81705c78b04597df2a7
+++ classes/siteinfo.bbclass ad8a25b8d98422ba10f5dd64a960dccedae4f42f
@@ -25,6 +25,7 @@ def get_siteinfo_list(d):
"armeb-linux-gnueabi": "endian-big bit-32 common-glibc arm-common armeb-linux",\
"armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\
"armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
+ "arm-darwin": "endian-little bit-32 common-darwin",\
"arm-linux": "endian-little bit-32 common-glibc arm-common",\
"arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\
"arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\
============================================================
--- conf/bitbake.conf 296476eab302b3db132347510f665c6d65f38712
+++ conf/bitbake.conf a1f6c5d6d3d4d66c93aa695c408f6bd53a242eb4
@@ -311,12 +311,13 @@ CCACHE = "${@bb.which(bb.data.getVar('PA
##################################################################
CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+TOOLCHAIN_OPTIONS = ""
-export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
-export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
-export CPP = "${HOST_PREFIX}gcc -E"
-export LD = "${HOST_PREFIX}ld"
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}"
+export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}"
export CCLD = "${CC}"
export AR = "${HOST_PREFIX}ar"
export AS = "${HOST_PREFIX}as"
============================================================
--- packages/libtool/libtool-cross_1.5.10.bb ea1ba26d91260c163e077eaf1ce72502cb22d75c
+++ packages/libtool/libtool-cross_1.5.10.bb 54bc11a40b3ffda524161118db81f8521ce06a24
@@ -1,14 +1,17 @@ require libtool_${PV}.bb
SECTION = "devel"
require libtool_${PV}.bb
-PR = "r6"
+PR = "r9"
PACKAGES = ""
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
+ file://libdir-la2.patch;patch=1 \
file://prefix.patch;patch=1 \
file://tag.patch;patch=1 \
- file://tag1.patch;patch=1 \
- file://install-path-check.patch;patch=1"
+ file://install-path-check.patch;patch=1 \
+ file://nmedit_fix.patch;patch=1 \
+ file://nousrlib.patch;patch=1"
+
S = "${WORKDIR}/libtool-${PV}"
prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
@@ -16,7 +19,13 @@ do_compile () {
bindir = "${STAGING_BINDIR_NATIVE}"
do_compile () {
- :
+ rm -f ltmain.shT
+ date=`/bin/sh ./mkstamp < ./ChangeLog` && \
+ sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \
+ -e "s%@""TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT
+ mv -f ltmain.shT ltmain.sh || \
+ (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
+ cp ltmain.sh ./libltdl/
}
do_stage () {
============================================================
--- packages/libtool/libtool-native_1.5.10.bb 3db44cdc921e61d2528664266cd0eda2cbf4d430
+++ packages/libtool/l%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -reb184b297334b4fd07df0787e5149d8be2c97b65 -rfe257dd745721f1280a74401ebb57a30f64581b2
#
#
#
# patch "packages/tasks/task-boot.bb"
# from [60ad04f700c75a0e13d10eb6be05890318c5b6ae]
# to [20830050f274ccd1736b3833d5540df643b893c8]
#
============================================================
--- packages/tasks/task-boot.bb 60ad04f700c75a0e13d10eb6be05890318c5b6ae
+++ packages/tasks/task-boot.bb 20830050f274ccd1736b3833d5540df643b893c8
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a devic
DESCRIPTION = "Basic task to get a device booting"
-PR = "r41"
+PR = "r42"
inherit task
More information about the Openembedded-commits
mailing list