[oe-commits] org.oe.dev merge of '409a4420e74feeb71713c8fa1d853dfa021daf3f'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 13:16:19 UTC 2008
merge of '409a4420e74feeb71713c8fa1d853dfa021daf3f'
and '538e4bfaca216445bb346ce8d4d110161a06c902'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4df1badaa6742b2ffb1171205da321c1f5040b56
ViewMTN: http://monotone.openembedded.org/revision/info/4df1badaa6742b2ffb1171205da321c1f5040b56
Files:
1
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_cvs.bb
classes/packaged-staging.bbclass
classes/packaged-staging2.bbclass
packages/sylpheed/claws-mail_3.2.0.bb
packages/sylpheed/claws-mail_3.3.0.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb
packages/sylpheed/claws-plugin-rssyl_0.17.bb
packages/sylpheed/claws-plugin-rssyl_0.18.bb
packages/ipkg/files/enable_debversion.patch
classes/base.bbclass
classes/kernel.bbclass
classes/package.bbclass
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_rpm.bbclass
classes/package_tar.bbclass
conf/sanity.conf
packages/gcc/gcc-package.inc
packages/ipkg/files/update_version_comparision.patch
packages/ipkg/ipkg-native_0.99.163.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp_2.6.24.bb
Diffs:
#
# mt diff -r409a4420e74feeb71713c8fa1d853dfa021daf3f -r4df1badaa6742b2ffb1171205da321c1f5040b56
#
#
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [5bd60a7af1398231f76c6398fe56302fd0365b70]
# to [c6e59d187a86e3879d6706eec131fcb2ef20df8f]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [cfa8c9faeecc70a284baf78119129a3ec85c1639]
# to [74d5840965d9e8477bcde441cc02899c2baf051b]
#
============================================================
--- packages/efl1/ecore-native_cvs.bb 5bd60a7af1398231f76c6398fe56302fd0365b70
+++ packages/efl1/ecore-native_cvs.bb c6e59d187a86e3879d6706eec131fcb2ef20df8f
@@ -1,7 +1,7 @@ DEPENDS = "eet-native evas-native"
require ecore.inc
inherit native
DEPENDS = "eet-native evas-native"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
@@ -19,6 +19,7 @@ EXTRA_OECONF = "\
--disable-ecore-evas-x11-gl \
--disable-ecore-evas-xrender \
--disable-ecore-evas-dfb \
+ --disable-ecore-evas-sdl \
--disable-openssl \
--enable-abstract-sockets \
--enable-ecore-con \
============================================================
--- packages/efl1/ecore_cvs.bb cfa8c9faeecc70a284baf78119129a3ec85c1639
+++ packages/efl1/ecore_cvs.bb 74d5840965d9e8477bcde441cc02899c2baf051b
@@ -1,5 +1,5 @@ require ecore.inc
require ecore.inc
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
@@ -19,6 +19,7 @@ EXTRA_OECONF = "\
--disable-ecore-evas-x11-gl \
--enable-ecore-evas-xrender \
--disable-ecore-evas-dfb \
+ --disable-ecore-evas-sdl \
--disable-openssl \
--enable-abstract-sockets \
--enable-ecore-con \
#
# mt diff -r538e4bfaca216445bb346ce8d4d110161a06c902 -r4df1badaa6742b2ffb1171205da321c1f5040b56
#
#
#
# delete "classes/packaged-staging.bbclass"
#
# rename "classes/packaged-staging2.bbclass"
# to "classes/packaged-staging.bbclass"
#
# rename "packages/sylpheed/claws-mail_3.2.0.bb"
# to "packages/sylpheed/claws-mail_3.3.0.bb"
#
# rename "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.bb"
# to "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb"
#
# rename "packages/sylpheed/claws-plugin-rssyl_0.17.bb"
# to "packages/sylpheed/claws-plugin-rssyl_0.18.bb"
#
# add_file "packages/ipkg/files/enable_debversion.patch"
# content [cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4]
#
# patch "classes/base.bbclass"
# from [1b34e4a362d34a52711b4639d6da382b6ddcf3c8]
# to [b9e3242f33b6557cb0a7ae902cf31b9a284c1db3]
#
# patch "classes/kernel.bbclass"
# from [3aa638c9a8de8e90342e08b530a40c8c2f120497]
# to [f6edb57c93d376a79d6495683e17bddaa5e58f82]
#
# patch "classes/package.bbclass"
# from [31efdfccff0ea3fd6bdb3476c5dd2c61c54179f9]
# to [dc63605ba8dcffa74084780d9c48b0ca2578fd0e]
#
# patch "classes/package_deb.bbclass"
# from [a66d4de9c722f1036751451a493943d826067859]
# to [7d3c717409e185acf693d9654d2623edca784403]
#
# patch "classes/package_ipk.bbclass"
# from [026a54435a436ef29405fa6b02afea519cc76ce7]
# to [fdf9fdf2855198b24b017026dd3777995b2977d2]
#
# patch "classes/package_rpm.bbclass"
# from [544d06eecdf8053fd26fb5ad0149bf70d704de12]
# to [a1fb065dd1092df200d5baf08e48408748eea688]
#
# patch "classes/package_tar.bbclass"
# from [cb0aff337888acb90332c226a3b5ba7c508f5190]
# to [890d4262a3d5d0dcbe7a0ed77680af01177555e8]
#
# patch "conf/sanity.conf"
# from [9ad5f1d9953217df59e03a3c6727b8246f383334]
# to [8074d545842c568a6a98bad4358a6da7c037e6c6]
#
# patch "packages/gcc/gcc-package.inc"
# from [760299e5f8168507c53a5d73b89438f7a75d5c7c]
# to [29d6e860f56905f8f155890e57612975fabd4f9b]
#
# patch "packages/ipkg/files/update_version_comparision.patch"
# from [b940420d7d71ccae026536ddf7f2c5c503485a9d]
# to [b27a147719155ca75d7585e69ef2e15235abdcbc]
#
# patch "packages/ipkg/ipkg-native_0.99.163.bb"
# from [a204f18c290c5da4e91d8300e8461c07ebc1795e]
# to [0d7e87a2e2f66d624a7e034690d53d974ae9e57e]
#
# patch "packages/ipkg/ipkg.inc"
# from [24a763cc5bb1e3e620137a13ec1a20d94c5f06a8]
# to [332bfe0f61d6c8443783d20a9719146515a88286]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [3bd38599bcc9677fbd8d3f25e54fb498786d46f2]
# to [262c4c75aad0d5ab5de6232839bec4f9a98e15d3]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemux86"
# from [e957ede99acce329ffd597dabb3188d4ccc3fa35]
# to [abcf23ccda1d1691e725575e21a8b0334e72f671]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [660ace9202cedafc6cbeb0a7336411637f497bd5]
# to [206f93d5f5951b555e53ecc7af105a4727b43f56]
#
============================================================
--- packages/ipkg/files/enable_debversion.patch cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4
+++ packages/ipkg/files/enable_debversion.patch cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4
@@ -0,0 +1,111 @@
+OE makes heavy use of the revision field so it makes sense to
+enable it. We don't want the familiar stuff though so patch that
+out.
+
+RP - 19/02/2008
+
+Index: ipkg-0.99.163/pkg.c
+===================================================================
+--- ipkg-0.99.163.orig/pkg.c 2008-02-19 00:35:03.000000000 +0000
++++ ipkg-0.99.163/pkg.c 2008-02-19 00:36:02.000000000 +0000
+@@ -1118,15 +1118,11 @@
+ return r;
+ }
+
+-#ifdef USE_DEBVERSION
+ r = verrevcmp(pkg->revision, ref_pkg->revision);
+ if (r) {
+ return r;
+ }
+
+- r = verrevcmp(pkg->familiar_revision, ref_pkg->familiar_revision);
+-#endif
+-
+ return r;
+ }
+
+@@ -1240,10 +1236,7 @@
+ {
+ char *complete_version;
+ char *epoch_str;
+-#ifdef USE_DEBVERSION
+ char *revision_str;
+- char *familiar_revision_str;
+-#endif
+
+ if (pkg->epoch) {
+ sprintf_alloc(&epoch_str, "%d:", pkg->epoch);
+@@ -1251,33 +1244,18 @@
+ epoch_str = strdup("");
+ }
+
+-#ifdef USE_DEBVERSION
+ if (pkg->revision && strlen(pkg->revision)) {
+ sprintf_alloc(&revision_str, "-%s", pkg->revision);
+ } else {
+ revision_str = strdup("");
+ }
+
+- if (pkg->familiar_revision && strlen(pkg->familiar_revision)) {
+- sprintf_alloc(&familiar_revision_str, "-fam%s", pkg->familiar_revision);
+- } else {
+- familiar_revision_str = strdup("");
+- }
+-#endif
+
+-#ifdef USE_DEBVERSION
+- sprintf_alloc(&complete_version, "%s%s%s%s",
+- epoch_str, pkg->version, revision_str, familiar_revision_str);
+-#else
+- sprintf_alloc(&complete_version, "%s%s",
+- epoch_str, pkg->version);
+-#endif
++ sprintf_alloc(&complete_version, "%s%s%s",
++ epoch_str, pkg->version, revision_str);
+
+ free(epoch_str);
+-#ifdef USE_DEBVERSION
+ free(revision_str);
+- free(familiar_revision_str);
+-#endif
+
+ return complete_version;
+ }
+Index: ipkg-0.99.163/pkg_parse.c
+===================================================================
+--- ipkg-0.99.163.orig/pkg_parse.c 2008-02-19 00:35:03.000000000 +0000
++++ ipkg-0.99.163/pkg_parse.c 2008-02-19 00:38:42.000000000 +0000
+@@ -105,9 +105,7 @@
+ int parseVersion(pkg_t *pkg, char *raw)
+ {
+ char *colon, *eepochcolon;
+-#ifdef USE_DEBVERSION
+ char *hyphen;
+-#endif
+ unsigned long epoch;
+
+ if (!*raw) {
+@@ -149,23 +147,12 @@
+ }
+ strcpy(pkg->version, raw);
+
+-#ifdef USE_DEBVERSION
+ hyphen= strrchr(pkg->version,'-');
+
+ if (hyphen) {
+ *hyphen++= 0;
+- if (strncmp("fam", hyphen, 3) == 0) {
+- pkg->familiar_revision=hyphen+3;
+- hyphen= strrchr(pkg->version,'-');
+- if (hyphen) {
+- *hyphen++= 0;
+- pkg->revision = hyphen;
+- }
+- } else {
+ pkg->revision = hyphen;
+- }
+ }
+-#endif
+
+ /*
+ fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
============================================================
--- classes/base.bbclass 1b34e4a362d34a52711b4639d6da382b6ddcf3c8
+++ classes/base.bbclass b9e3242f33b6557cb0a7ae902cf31b9a284c1db3
@@ -412,7 +412,6 @@ do_clean[nostamp] = "1"
addtask clean
do_clean[dirs] = "${TOPDIR}"
do_clean[nostamp] = "1"
-do_clean[bbdepcmd] = ""
python base_do_clean() {
"""clear the build and temp directories"""
dir = bb.data.expand("${WORKDIR}", d)
@@ -428,7 +427,6 @@ do_rebuild[nostamp] = "1"
addtask rebuild
do_rebuild[dirs] = "${TOPDIR}"
do_rebuild[nostamp] = "1"
-do_rebuild[bbdepcmd] = ""
python base_do_rebuild() {
"""rebuild a package"""
bb.build.exec_task('do_clean', d)
@@ -438,7 +436,6 @@ do_mrproper[nostamp] = "1"
addtask mrproper
do_mrproper[dirs] = "${TOPDIR}"
do_mrproper[nostamp] = "1"
-do_mrproper[bbdepcmd] = ""
python base_do_mrproper() {
"""clear downloaded sources, build and temp directories"""
dir = bb.data.expand("${DL_DIR}", d)
@@ -680,7 +677,6 @@ do_configure[dirs] = "${S} ${B}"
addtask configure after do_unpack do_patch
do_configure[dirs] = "${S} ${B}"
-do_configure[bbdepcmd] = "do_populate_staging"
do_configure[deptask] = "do_populate_staging"
base_do_configure() {
:
@@ -688,7 +684,6 @@ do_compile[dirs] = "${S} ${B}"
addtask compile after do_configure
do_compile[dirs] = "${S} ${B}"
-do_compile[bbdepcmd] = "do_populate_staging"
base_do_compile() {
if [ -e Makefile -o -e makefile ]; then
oe_runmake || die "make failed"
============================================================
--- classes/kernel.bbclass 3aa638c9a8de8e90342e08b530a40c8c2f120497
+++ classes/kernel.bbclass f6edb57c93d376a79d6495683e17bddaa5e58f82
@@ -128,6 +128,10 @@ kernel_do_stage() {
if [ -e arch/${ARCH}/Makefile ]; then
install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}
install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH}
+ # Otherwise check arch/x86/Makefile for i386 and x86_64 on kernels >= 2.6.24
+ elif [ -e arch/x86/Makefile ]; then
+ install -d ${STAGING_KERNEL_DIR}/arch/x86
+ install -m 0644 arch/x86/Makefile* ${STAGING_KERNEL_DIR}/arch/x86
fi
cp -fR include/config* ${STAGING_KERNEL_DIR}/include/
install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE}
============================================================
--- classes/package.bbclass 31efdfccff0ea3fd6bdb3476c5dd2c61c54179f9
+++ classes/package.bbclass dc63605ba8dcffa74084780d9c48b0ca2578fd0e
@@ -291,76 +291,6 @@ python package_do_split_locales() {
#bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
}
-def copyfile(src,dest,newmtime=None,sstat=None):
- """
- Copies a file from src to dest, preserving all permissions and
- attributes; mtime will be preserved even when moving across
- filesystems. Returns true on success and false on failure.
- """
- import os, stat, shutil, commands
-
- #print "copyfile("+src+","+dest+","+str(newmtime)+","+str(sstat)+")"
- try:
- if not sstat:
- sstat=os.lstat(src)
- except Exception, e:
- print "copyfile: Stating source file failed...", e
- return False
-
- destexists=1
- try:
- dstat=os.lstat(dest)
- except:
- dstat=os.lstat(os.path.dirname(dest))
- destexists=0
-
- if destexists:
- if stat.S_ISLNK(dstat[stat.ST_MODE]):
- try:
- os.unlink(dest)
- destexists=0
- except Exception, e:
- pass
-
- if stat.S_ISLNK(sstat[stat.ST_MODE]):
- try:
- target=os.readlink(src)
- if destexists and not stat.S_ISDIR(dstat[stat.ST_MODE]):
- os.unlink(dest)
- os.symlink(target,dest)
- #os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
- return os.lstat(dest)
- except Exception, e:
- print "copyfile: failed to properly create symlink:", dest, "->", target, e
- return False
-
- if stat.S_ISREG(sstat[stat.ST_MODE]):
- try: # For safety copy then move it over.
- shutil.copyfile(src,dest+"#new")
- os.rename(dest+"#new",dest)
- except Exception, e:
- print 'copyfile: copy', src, '->', dest, 'failed.', e
- return False
- else:
- #we don't yet handle special, so we need to fall back to /bin/mv
- a=commands.getstatusoutput("/bin/cp -f "+"'"+src+"' '"+dest+"'")
- if a[0]!=0:
- print "copyfile: Failed to copy special file:" + src + "' to '" + dest + "'", a
- return False # failure
- try:
- os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
- os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
- except Exception, e:
- print "copyfile: Failed to chown/chmod/unlink", dest, e
- return False
-
- if newmtime:
- os.utime(dest,(newmtime,newmtime))
- else:
- os.utime(dest, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME]))
- newmtime=sstat[stat.ST_MTIME]
- return newmtime
-
python populate_packages () {
import glob, stat, errno, re
@@ -462,7 +392,7 @@ python populate_packages () {
fpath = os.path.join(root,file)
dpath = os.path.dirname(fpath)
bb.mkdirhier(dpath)
- ret = copyfile(file, fpath)
+ ret = bb.copyfile(file, fpath)
if ret is False or ret == 0:
raise bb.build.FuncFailed("File population failed")
del localdata
@@ -578,7 +508,8 @@ python emit_pkgdata() {
os.chdir(root)
g = glob('*')
if g or allow_empty == "1":
- file(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), 'w').close()
+ packagedfile = bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d)
+ file(packagedfile, 'w').close()
}
emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
@@ -588,6 +519,8 @@ fi
fi
}
+SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs"
+
python package_do_shlibs() {
import os, re, os.path
@@ -606,25 +539,14 @@ python package_do_shlibs() {
bb.error("WORKDIR not defined")
return
- staging = bb.data.getVar('STAGING_DIR', d, 1)
- if not staging:
- bb.error("STAGING_DIR not defined")
- return
-
ver = bb.data.getVar('PV', d, 1)
if not ver:
bb.error("PV not defined")
return
- target_sys = bb.data.getVar('TARGET_SYS', d, 1)
- if not target_sys:
- bb.error("TARGET_SYS not defined")
- return
-
pkgdest = bb.data.getVar('PKGDEST', d, 1)
- shlibs_dir = os.path.join(staging, target_sys, "shlibs")
- old_shlibs_dir = os.path.join(staging, "shlibs")
+ shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
bb.mkdirhier(shlibs_dir)
needed = {}
@@ -681,7 +603,7 @@ python package_do_shlibs() {
shlib_provider = {}
list_re = re.compile('^(.*)\.list$')
- for dir in [old_shlibs_dir, shlibs_dir]:
+ for dir in [shlibs_dir]:
if not os.path.exists(dir):
continue
for file in os.listdir(dir):
@@ -751,20 +673,9 @@ python package_do_pkgconfig () {
bb.error("WORKDIR not defined")
return
- staging = bb.data.getVar('STAGING_DIR', d, 1)
- if not staging:
- bb.error("STAGING_DIR not defined")
- return
-
- target_sys = bb.data.getVar('TARGET_SYS', d, 1)
- if not target_sys:
- bb.error("TARGET_SYS not defined")
- return
-
pkgdest = bb.data.getVar('PKGDEST', d, 1)
- shlibs_dir = os.path.join(staging, target_sys, "shlibs")
- old_shlibs_dir = os.path.join(staging, "shlibs")
+ shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
bb.mkdirhier(shlibs_dir)
pc_re = re.compile('(.*)\.pc$')
@@ -814,7 +725,7 @@ python package_do_pkgconfig () {
f.write('%s\n' % p)
f.close()
- for dir in [old_shlibs_dir, shlibs_dir]:
+ for dir in [shlibs_dir]:
if not os.path.exists(dir):
continue
for file in os.listdir(dir):
@@ -882,14 +793,39 @@ python package_depchains() {
postfixes = (bb.data.getVar('DEPCHAIN_POST', d, 1) or '').split()
prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
+ def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
+
+ #bb.note('depends for %s is %s' % (base, depends))
+ rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
+
+ for depend in depends:
+ if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
+ #bb.note("Skipping %s" % depend)
+ continue
+ if depend.endswith('-dev'):
+ depend = depend.replace('-dev', '')
+ if depend.endswith('-dbg'):
+ depend = depend.replace('-dbg', '')
+ pkgname = getname(depend, suffix)
+ #bb.note("Adding %s for %s" % (pkgname, depend))
+ if not pkgname in rreclist:
+ rreclist.append(pkgname)
+
+ #bb.note('setting: RRECOMMENDS_%s=%s' % (pkg, ' '.join(rreclist)))
+ bb.data.setVar('RRECOMMENDS_%s' % pkg, ' '.join(rreclist), d)
+
def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
- #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:
+ if depend.endswith('-dev'):
+ depend = depend.replace('-dev', '')
+ if depend.endswith('-dbg'):
+ depend = depend.replace('-dbg', '')
pkgname = getname(depend, suffix)
- if not pkgname in rreclist and packaged(pkgname, d):
+ if not pkgname in rreclist:
rreclist.append(pkgname)
#bb.note('setting: RRECOMMENDS_%s=%s' % (pkg, ' '.join(rreclist)))
@@ -900,6 +836,10 @@ python package_depchains() {
if dep not in list:
list.append(dep)
+ depends = []
+ for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""):
+ add_dep(depends, dep)
+
rdepends = []
for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""):
add_dep(rdepends, dep)
@@ -932,6 +872,8 @@ python package_depchains() {
for suffix in pkgs:
for pkg in pkgs[suffix]:
(base, func) = pkgs[suffix][pkg]
+ if suffix == "-dev":
+ pkg_adddeprrecs(pkg, base, suffix, func, depends, d)
if len(pkgs[suffix]) == 1:
pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
else:
============================================================
--- classes/package_deb.bbclass a66d4de9c722f1036751451a493943d826067859
+++ classes/package_deb.bbclass 7d3c717409e185acf693d9654d2623edca784403
@@ -54,7 +54,7 @@ python do_package_deb_install () {
# env of the fork+execve'd processs
# Set up environment
- %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list