[oe-commits] org.oe.dev merge of 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Dec 2 16:16:50 UTC 2007
merge of 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
and 'd045039e1aba07c5bb52c9acf9236d6bb0cf1831'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 48e3d8ce0c21c80e6e929a3a992826251eed2f4d
ViewMTN: http://monotone.openembedded.org/revision/info/48e3d8ce0c21c80e6e929a3a992826251eed2f4d
Files:
1
packages/images/essential-image.bb
packages/images/essential-machine-image.bb
packages/libtool/libtool-1.5.10/tag1.patch
classes/packaged-staging2.bbclass
packages/git/git-native_1.5.3.bb
packages/git/git.inc
packages/ipkg/files/ipkg_bugfix.patch
packages/libtool/libtool-1.5.10/libdir-la2.patch
packages/libtool/libtool-1.5.10/nmedit_fix.patch
packages/libtool/libtool-1.5.10/nousrlib.patch
site/arm-darwin
classes/base.bbclass
classes/cross.bbclass
classes/debian.bbclass
classes/package.bbclass
classes/siteinfo.bbclass
conf/bitbake.conf
conf/machine/include/ixp4xx.inc
packages/ipkg/ipkg-native_0.99.163.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool_1.5.10.bb
packages/linux/linux-ixp4xx/defconfig-2.6.21.6
packages/linux/linux-ixp4xx_2.6.21.6.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/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/x11vnc/x11vnc_0.9.3.bb
site/common-glibc
packages/lyx/lyx_1.4.1.bb
packages/lyx/lyx_1.4.4.bb
packages/lyx/lyx_1.5.1.bb
Diffs:
#
# mt diff -rcdaf3702bfeaebdf9d1466a398935ab179583c9a -r48e3d8ce0c21c80e6e929a3a992826251eed2f4d
#
#
#
# delete "packages/images/essential-image.bb"
#
# delete "packages/images/essential-machine-image.bb"
#
# delete "packages/libtool/libtool-1.5.10/tag1.patch"
#
# add_file "classes/packaged-staging2.bbclass"
# content [59a91d125afea47071a318c45a9942ffd3d8111b]
#
# add_file "packages/git/git-native_1.5.3.bb"
# content [0eee3955b85d6ba2bd393cc5e7525c848366f62c]
#
# add_file "packages/git/git.inc"
# content [ce7e34b4dd8490461c6e668e1fc0f228df6a0f62]
#
# add_file "packages/ipkg/files/ipkg_bugfix.patch"
# content [7196e094a6eea0772015cde5f3c119ebec352085]
#
# add_file "packages/libtool/libtool-1.5.10/libdir-la2.patch"
# content [d1963c450f45aec334ceb0c17f3a8beeb5f990df]
#
# add_file "packages/libtool/libtool-1.5.10/nmedit_fix.patch"
# content [aab94763555e9c9e126cfe1aa734e1c23e4acc70]
#
# add_file "packages/libtool/libtool-1.5.10/nousrlib.patch"
# content [538e988983e99646792a9cd6ddc81d748cf8eaa1]
#
# 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 "conf/machine/include/ixp4xx.inc"
# from [6e346e8a0d72478aa861a2ea2324cc2871a72e54]
# to [061e47cc6cd7843090e32bb8bbe59909e1f3df1e]
#
# patch "packages/ipkg/ipkg-native_0.99.163.bb"
# from [87ca1449de6ccb2e78e19bcbabdaf6368070902b]
# to [254630516ad5b6def75021ad9bb723fd5e62382f]
#
# 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/linux/linux-ixp4xx/defconfig-2.6.21.6"
# from [c8f2393bacd7f497d9c1c712cfe77848122b86d2]
# to [9ca518ef9fe19819dabdafe4129c5c8b3bc39729]
#
# patch "packages/linux/linux-ixp4xx_2.6.21.6.bb"
# from [f754b93eafcd639331fbc458e277dc3b7f52330d]
# to [432d1186db63f39ff236b15e6d5206fd96c5470e]
#
# 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/tasks/task-base.bb"
# from [1a67a9902fc957b26de1621d69f747dac26ee6e2]
# to [6f33e4ea8083953d24993dca089ae71114f8a639]
#
# patch "packages/tasks/task-boot.bb"
# from [60ad04f700c75a0e13d10eb6be05890318c5b6ae]
# to [20830050f274ccd1736b3833d5540df643b893c8]
#
# patch "packages/x11vnc/x11vnc_0.9.3.bb"
# from [b96331abea630fdec35fc060d5a57913a178461a]
# to [aa732c8e4a44358ecadf82dfb92bfb011ab2bd20]
#
# patch "site/common-glibc"
# from [6805917425c88e6085e0d4ddc9881ab19e272e62]
# to [4405815e133a050b155173bd66db32480d6feae1]
#
============================================================
--- classes/packaged-staging2.bbclass 59a91d125afea47071a318c45a9942ffd3d8111b
+++ classes/packaged-staging2.bbclass 59a91d125afea47071a318c45a9942ffd3d8111b
@@ -0,0 +1,229 @@
+#
+# Populate builds using prebuilt packages where possible to speed up builds
+# and allow staging to be reconstructed.
+#
+# To use it add that line to conf/local.conf:
+#
+# INHERIT = "packaged-staging"
+
+python () {
+ import bb
+ if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('image', d) and not bb.data.inherits_class('cross', d) and not bb.data.inherits_class('sdk', d):
+ deps = bb.data.getVarFlag('do_populate_staging', 'depends', d) or ""
+ deps += " stagemanager-native:do_populate_staging"
+ bb.data.setVarFlag('do_populate_staging', 'depends', deps, d)
+
+ deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or ""
+ deps += " ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+ bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d)
+ else:
+ bb.data.setVar("PSTAGING_DISABLED", "1", d)
+}
+
+export PSTAGING_DISABLED = "0"
+
+DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage"
+
+PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}"
+PSTAGE_INSTALL_CMD = "ipkg-cl install -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_UPDATE_CMD = "ipkg-cl update -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_REMOVE_CMD = "ipkg-cl remove -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_LIST_CMD = "ipkg-cl list_installed -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_PKGNAME = "staging-${PN}_${PV}-${PR}_${MULTIMACH_ARCH}.ipk"
+
+PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg"
+
+do_clean_append() {
+ """
+ Clear the build and temp directories
+ """
+ bb.note("Uninstalling package from staging...")
+ path = bb.data.getVar("PATH", d, 1)
+ removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
+ removepkg = bb.data.expand("staging-${PN}", d)
+ ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg))
+ if ret != 0:
+ bb.note("Failure removing staging package")
+
+ stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d)
+ bb.note("Removing staging package %s" % stagepkg)
+ #os.system('rm -rf ' + stagepkg)
+}
+
+staging_helper () {
+ #assemble appropriate ipkg.conf
+ conffile=${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf
+ mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists
+ if [ ! -e $conffile ]; then
+ ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
+ priority=1
+ for arch in $ipkgarchs; do
+ echo "arch $arch $priority" >> $conffile
+ priority=$(expr $priority + 5)
+ done
+ echo "src oe-staging file:${DEPLOY_DIR_PSTAGE}" >> $conffile
+
+ OLD_PWD=`pwd`
+ cd ${DEPLOY_DIR_PSTAGE}
+ ipkg-make-index -p Packages .
+ cd ${OLD_PWD}
+
+ ${PSTAGE_UPDATE_CMD}
+ fi
+}
+
+python do_prepackaged_stage () {
+ import os
+
+ if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1":
+ bb.build.make_stamp("do_prepackaged_stage", d)
+ return
+
+ bb.note("Uninstalling any existing package from staging...")
+ path = bb.data.getVar("PATH", d, 1)
+ removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
+ removepkg = bb.data.expand("staging-${PN}", d)
+ lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+ ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg))
+ bb.utils.unlockfile(lf)
+ if ret != 0:
+ bb.note("Failure attempting to remove staging package")
+
+ stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d)
+
+ if os.path.exists(stagepkg):
+ bb.note("Following speedup\n")
+ path = bb.data.getVar("PATH", d, 1)
+ installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1)
+
+ bb.build.exec_func("staging_helper", d)
+
+ bb.debug(1, "Staging stuff already packaged, using that instead")
+ lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+ ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg))
+ bb.utils.unlockfile(lf)
+ if ret != 0:
+ bb.note("Failure installing prestage package")
+
+ bb.build.make_stamp("do_prepackaged_stage", d)
+ bb.build.make_stamp("do_fetch", d)
+ bb.build.make_stamp("do_unpack", d)
+ bb.build.make_stamp("do_munge", d)
+ bb.build.make_stamp("do_patch", d)
+ bb.build.make_stamp("do_configure", d)
+ bb.build.make_stamp("do_qa_configure", d)
+ bb.build.make_stamp("do_rig_locales", d)
+ bb.build.make_stamp("do_compile", d)
+ bb.build.make_stamp("do_install", d)
+ bb.build.make_stamp("do_deploy", d)
+ bb.build.make_stamp("do_package", d)
+ bb.build.make_stamp("do_populate_staging", d)
+ bb.build.make_stamp("do_package_write_deb", d)
+ bb.build.make_stamp("do_package_write_ipk", d)
+ bb.build.make_stamp("do_package_write", d)
+ bb.build.make_stamp("do_package_stage", d)
+ bb.build.make_stamp("do_qa_staging", d)
+
+ else:
+ bb.build.make_stamp("do_prepackaged_stage", d)
+}
+do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}"
+do_prepackaged_stage[selfstamp] = "1"
+addtask prepackaged_stage before do_fetch
+
+populate_staging_preamble () {
+ if [ "$PSTAGING_DISABLED" != "1" ]; then
+ #mkdir -p ${DEPLOY_DIR_PSTAGE}
+
+ stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u
+ stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u
+ fi
+}
+
+populate_staging_postamble () {
+ if [ "$PSTAGING_DISABLED" != "1" ]; then
+ # list the packages currently installed in staging
+ ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list
+
+ set +e
+ stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging
+ stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross
+ set -e
+ fi
+}
+
+do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
+do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
+python do_populate_staging_prepend() {
+ bb.build.exec_func("populate_staging_preamble", d)
+}
+
+python do_populate_staging_append() {
+ bb.build.exec_func("populate_staging_postamble", d)
+}
+
+
+staging_packager () {
+
+ mkdir -p ${PSTAGE_TMPDIR_STAGE}/CONTROL
+
+ echo "Package: staging-${PN}" > ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Version: ${PV}-${PR}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Description: ${DESCRIPTION}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Section: ${SECTION}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Priority: Optional" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Maintainer: ${MAINTAINER}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Architecture: ${MULTIMACH_ARCH}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+
+ ${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}
+ ${PSTAGE_INSTALL_CMD} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}
+}
+
+python do_package_stage () {
+ if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1":
+ return
+
+ bb.build.exec_func("read_subpackage_metadata", d)
+ packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+ if len(packages) > 0:
+ stagepath = bb.data.getVar("PSTAGE_TMPDIR_STAGE", d, 1)
+ if bb.data.inherits_class('package_ipk', d):
+ ipkpath = os.path.join(stagepath, "deploy", "ipk")
+ bb.mkdirhier(ipkpath)
+ if bb.data.inherits_class('package_deb', d):
+ debpath = os.path.join(stagepath, "deploy", "deb")
+ bb.mkdirhier(debpath)
+
+ for pkg in packages:
+ pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
+ if not pkgname:
+ pkgname = pkg
+ arch = bb.data.getVar('PACKAGE_ARCH_%s' % pkg, d, 1)
+ if not arch:
+ arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
+ if not packaged(pkg, d):
+ continue
+ if bb.data.inherits_class('package_ipk', d):
+ srcname = bb.data.expand(pkgname + "_${PV}-${PR}_" + arch + ".ipk", d)
+ srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d)
+ if not os.path.exists(srcfile):
+ bb.fatal("Package %s does not exist yet it should" % srcfile)
+ bb.copyfile(srcfile, ipkpath + "/" + srcname)
+ if bb.data.inherits_class('package_deb', d):
+ if arch == 'all':
+ srcname = bb.data.expand(pkgname + "_${PV}-${PR}_all.deb", d)
+ else:
+ srcname = bb.data.expand(pkgname + "_${PV}-${PR}_${DPKG_ARCH}.deb", d)
+ srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d)
+ if not os.path.exists(srcfile):
+ bb.fatal("Package %s does not exist yet it should" % srcfile)
+ bb.copyfile(srcfile, debpath + "/" + srcname)
+ bb.build.exec_func("staging_helper", d)
+ lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+ bb.build.exec_func("staging_packager", d)
+ bb.utils.unlockfile(lf)
+}
+
+addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build
+
============================================================
--- 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/ipkg/files/ipkg_bugfix.patch 7196e094a6eea0772015cde5f3c119ebec352085
+++ packages/ipkg/files/ipkg_bugfix.patch 7196e094a6eea0772015cde5f3c119ebec352085
@@ -0,0 +1,44 @@
+Index: C/ipkg_conf.c
+===================================================================
+--- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000
++++ C/ipkg_conf.c 2007-11-27 01:11:17.000000000 +0000
+@@ -423,6 +423,7 @@
+ nv_pair_t *nv_pair;
+ pkg_dest_t *dest;
+ char *root_dir;
++ char *list_dir2;
+
+ for (iter = nv_pair_list->head; iter; iter = iter->next) {
+ nv_pair = iter->data;
+@@ -432,8 +433,14 @@
+ } else {
+ root_dir = strdup(nv_pair->value);
+ }
+- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
++ if (conf->offline_root) {
++ sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir);
++ } else {
++ list_dir2 = strdup(lists_dir);
++ }
++ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2);
+ free(root_dir);
++ free(list_dir2);
+ if (dest == NULL) {
+ continue;
+ }
+@@ -562,13 +569,13 @@
+ } else if (strcmp(type, "dest") == 0) {
+ nv_pair_list_append(tmp_dest_nv_pair_list, name, val%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd045039e1aba07c5bb52c9acf9236d6bb0cf1831 -r48e3d8ce0c21c80e6e929a3a992826251eed2f4d
#
#
#
# patch "packages/lyx/lyx_1.4.1.bb"
# from [b47cd9a9b59ec8efd84f7ade62935b63e15fee89]
# to [4ecba0a849dcbb870938315383cfe642f55ad8c5]
#
# patch "packages/lyx/lyx_1.4.4.bb"
# from [2c90c18da6fe12531245213b8e2f6001469753b1]
# to [7b49ce4d2778fb61d04e0dd3486d062f09f1e6f8]
#
# patch "packages/lyx/lyx_1.5.1.bb"
# from [5541c792ef4a873fa0fcb9ed299cb24666497562]
# to [64d2311f21febb13095d37580b44f343bce894b1]
#
============================================================
--- packages/lyx/lyx_1.4.1.bb b47cd9a9b59ec8efd84f7ade62935b63e15fee89
+++ packages/lyx/lyx_1.4.1.bb 4ecba0a849dcbb870938315383cfe642f55ad8c5
@@ -10,7 +10,7 @@ S = "${WORKDIR}/lyx-1_4_1"
SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_1;rev=13847"
S = "${WORKDIR}/lyx-1_4_1"
-inherit autotools qt3x11
+inherit qt3x11 autotools
EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}"
PARALLEL_MAKE = ""
============================================================
--- packages/lyx/lyx_1.4.4.bb 2c90c18da6fe12531245213b8e2f6001469753b1
+++ packages/lyx/lyx_1.4.4.bb 7b49ce4d2778fb61d04e0dd3486d062f09f1e6f8
@@ -10,7 +10,7 @@ S = "${WORKDIR}/lyx-1_4_4"
SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_4;rev=17185"
S = "${WORKDIR}/lyx-1_4_4"
-inherit autotools qt3x11
+inherit qt3x11 autotools
EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}"
PARALLEL_MAKE = ""
============================================================
--- packages/lyx/lyx_1.5.1.bb 5541c792ef4a873fa0fcb9ed299cb24666497562
+++ packages/lyx/lyx_1.5.1.bb 64d2311f21febb13095d37580b44f343bce894b1
@@ -1,17 +1,15 @@ DEPENDS = "boost qt4-x11-free"
DESCRIPTION = "LyX is an advanced type setting processor - a frontend for LaTeX"
SECTION = "x11/office"
LICENSE = "GPL"
HOMEPAGE = "http://www.lyx.org"
DEPENDS = "boost qt4-x11-free"
-RRECOMMENDS = "tetex"
+RSUGGESTS = "tetex"
RDEPENDS = "python-shell python-textutils"
PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "http://lyx.cybermirror.org/stable/lyx-${PV}.tar.bz2"
-inherit autotools qt4x11
+inherit qt4x11 autotools
EXTRA_OECONF = " --with-qt4-dir=${QTDIR} -enable-pch"
EXTRA_QMAKEVARS_POST = "DEFINES+=_LIBC"
More information about the Openembedded-commits
mailing list