mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from mainline OE to try and keep us in sync.

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2005-10-10 10:41:35 +00:00
parent 562d4d3587
commit cbf3ef9130
41 changed files with 169 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openembedded/classes/autotools.bbclass
View File

@@ -150,4 +150,16 @@ autotools_stage_includes() {
fi
}
autotools_stage_all() {
if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
then
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
oe_runmake DESTDIR="${STAGE_TEMP}" install
cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
rm -rf ${STAGE_TEMP}
fi
}
EXPORT_FUNCTIONS do_configure do_install

4
openembedded/classes/binconfig.bbclass
View File

@@ -24,8 +24,10 @@ def is_native(d):
import bb.data
return ["","-native"][bb.data.inherits_class('native', d)]
BINCONFIG_GLOB ?= "*-config"
do_stage_append() {
for config in `find ${S} -name '*-config'`; do
for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
configname=`basename $config`${@is_native(d)}
install -d ${STAGING_BINDIR}
cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname

4
openembedded/classes/efl.bbclass
View File

@@ -38,6 +38,10 @@ export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
do_compile_prepend() {
find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
}
do_stage_append () {
for i in ${libraries}
do

4
openembedded/classes/kernel.bbclass
View File

@@ -60,7 +60,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
kernel_do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
if ${KERNEL_MAJOR_VERSION} != "2.6"; then
oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
fi
oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"

1
openembedded/classes/qt3x11.bbclass
View File

@@ -1,4 +1,3 @@
DEPENDS += "qt3-x11"
#
# override variables set by qmake-base to compile Qt/X11 apps
#

1
openembedded/classes/qt4x11.bbclass
View File

@@ -1,4 +1,3 @@
DEPENDS += "qt4-x11"
#
# override variables set by qmake-base to compile Qt/X11 apps
#

4
openembedded/classes/sourcepkg.bbclass
View File

@@ -1,5 +1,5 @@
DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source"
EXCLUDE_FROM ?= ".pc"
EXCLUDE_FROM ?= ".pc autom4te.cache"
# used as part of a path. make sure it's set
DISTRO ?= "openembedded"
@@ -42,7 +42,7 @@ sourcepkg_do_create_orig_tgz(){
echo $src_tree
oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file
tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
cp -pPR $src_tree $src_tree.orig
}