summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/cross.bbclass1
-rw-r--r--classes/dietlibc.bbclass12
-rw-r--r--classes/e.bbclass4
-rw-r--r--classes/efl.bbclass3
-rw-r--r--classes/gnome.bbclass1
-rw-r--r--classes/image.bbclass6
-rw-r--r--classes/insane.bbclass3
-rw-r--r--classes/kernel.bbclass3
-rw-r--r--classes/package.bbclass4
-rw-r--r--classes/package_ipk.bbclass1
-rw-r--r--classes/packaged-staging.bbclass2
-rw-r--r--classes/siteinfo.bbclass47
12 files changed, 39 insertions, 48 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 7debde6669..68e3803f3e 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -17,6 +17,7 @@ HOST_OS = "${BUILD_OS}"
HOST_PREFIX = "${BUILD_PREFIX}"
HOST_CC_ARCH = "${BUILD_CC_ARCH}"
HOST_EXEEXT = "${BUILD_EXEEXT}"
+BASEPKG_HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
CPPFLAGS = "${BUILD_CPPFLAGS}"
CFLAGS = "${BUILD_CFLAGS}"
diff --git a/classes/dietlibc.bbclass b/classes/dietlibc.bbclass
index 7c7b5fec81..2676385197 100644
--- a/classes/dietlibc.bbclass
+++ b/classes/dietlibc.bbclass
@@ -4,18 +4,18 @@ def dietlibc_after_parse(d):
import bb
# Remove the NLS
cfg = oe_filter_out('--(dis|en)able-nls', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
- # Remove shared and static and set it right
- cfg += " --disable-nls --disbale-shared --enable-static"
+ # Remove shared enable static only
+ cfg += " --disable-nls --disable-shared --enable-static"
bb.data.setVar('EXTRA_OECONF', cfg, d)
cfg = bb.data.getVar('EXTRA_OEMAKE', d, 1) or ""
cfg = oe_filter_out("\'CC=", bb.data.getVar('EXTRA_OEMAKE', d, 1) or "", d)
- cfgtmp = "\'CC=diet ${CCACHE}"
+ cfgtmp = "\'CC=\"diet ${CCACHE}\""
cfgtmp += cfg
bb.data.setVar('EXTRA_OEMAKE', cfgtmp, d)
-python () {
- dietlibc_after_parse(d)
-}
+#python () {
+# dietlibc_after_parse(d)
+#}
set_dietlibc_env () {
export CC="diet ${CC}"
diff --git a/classes/e.bbclass b/classes/e.bbclass
index a56cdff2e1..a6fa1d0d78 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -21,7 +21,9 @@ do_configure_append() {
export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib"
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+# And it's in efl.bbclass as well....
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 9d24a0f337..22e664ce01 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -23,7 +23,8 @@ do_stage() {
autotools_stage_all
}
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests"
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests"
FILES_${PN} = "${libdir}/*.so.*"
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 3d04298ac6..2045697516 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -11,6 +11,7 @@ DEPENDS += "gnome-common"
FILES_${PN} += "${datadir}/application-registry \
${datadir}/mime-info \
${datadir}/mime/packages \
+ ${datadir}/mime/application \
${datadir}/gnome-2.0"
inherit autotools gtk-icon-cache pkgconfig gconf mime
diff --git a/classes/image.bbclass b/classes/image.bbclass
index f7afbab81e..f03a115388 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -72,13 +72,11 @@ def get_devtable_list(d):
devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
if devtable != None:
return devtable
- str = ""
devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
if devtables == None:
devtables = 'files/device_table-minimal.txt'
- for devtable in devtables.split():
- str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
- return str
+ return " ".join([ bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
+ for devtable in devtables.split() ])
def get_imagecmds(d):
import bb
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index c41b84a4c0..950bb9771e 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -80,6 +80,9 @@ def package_qa_get_machine_dict():
"linux-gnuspe" : {
"powerpc": (20, 0, 0, False, True),
},
+ "linux-uclibcspe" : {
+ "powerpc": (20, 0, 0, False, True),
+ },
}
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index c5192d59d4..9c1f637a66 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -530,7 +530,7 @@ do_deploy() {
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
if [ -d "${D}/lib" ]; then
- tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib
+ fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib
fi
cd ${DEPLOY_DIR_IMAGE}
@@ -540,5 +540,6 @@ do_deploy() {
}
do_deploy[dirs] = "${S}"
+do_deploy[depends] += "fakeroot-native:do_populate_staging"
addtask deploy before do_package after do_install
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 5a9fa503ae..0cba1260d8 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -159,7 +159,7 @@ def runstrip(file, d):
if ret:
bb.error("runstrip: 'file %s' failed (forced strip)" % file)
- if "not stripped" not in result:
+ if "not stripped" not in result and not file.endswith(".a"):
bb.debug(1, "runstrip: skip %s" % file)
return 0
@@ -393,7 +393,7 @@ python populate_packages () {
for root, dirs, files in os.walk(dvar):
for f in files:
file = os.path.join(root, f)
- if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
+ if not os.path.islink(file) and not os.path.isdir(file) and (isexec(file) or ".a" in file):
runstrip(file, d)
pkgdest = bb.data.getVar('PKGDEST', d, 1)
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index e5561082fd..b48f8781eb 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -85,6 +85,7 @@ do_package_update_index_ipk () {
return
fi
+ mkdir -p ${DEPLOY_DIR_IPK}
touch ${DEPLOY_DIR_IPK}/Packages
ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 33acb90a2b..3b97f593b8 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -284,7 +284,7 @@ populate_staging_postamble () {
if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
exit $exitcode
fi
- stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross
+ stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}
if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
exit $exitcode
fi
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index 2bacd69488..5c929dffcd 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -22,27 +22,21 @@ def get_siteinfo_list(d):
targetinfo = {\
"armeb-linux": "endian-big bit-32 common-linux common-glibc arm-common",\
- "armeb-linux-gnu": "endian-big bit-32 common-linux common-glibc arm-common",\
"armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\
"armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\
"armeb-linux-uclibceabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\
"arm-darwin": "endian-little bit-32 common-darwin",\
"arm-darwin9": "endian-little bit-32 common-darwin",\
"arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\
- "arm-linux-gnu": "endian-little bit-32 common-linux common-glibc arm-common",\
"arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\
"arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\
"arm-linux-uclibceabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\
"avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\
"bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\
- "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i386-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i486-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i586-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "i686-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\
+ "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
+ "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
+ "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
+ "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
"i386-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\
"i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\
"i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\
@@ -55,35 +49,24 @@ def get_siteinfo_list(d):
"i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\
"i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\
"i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\
- "ia64-linux": "endian-little bit-64 common-linux common-glibc",\
- "ia64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\
- "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\
- "mipsel-linux-gnu": "endian-little bit-32 common-linux common-glibc",\
- "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\
- "mips-linux": "endian-big bit-32 common-linux common-glibc",\
- "mips-linux-gnu": "endian-big bit-32 common-linux common-glibc",\
- "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc",\
+ "ia64-linux": "endian-little bit-64 common-linux common-glibc",\
+ "mipsel-linux": "endian-little bit-32 common-linux common-glibc mips-common",\
+ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc mips-common",\
+ "mips-linux": "endian-big bit-32 common-linux common-glibc mips-common",\
+ "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc mips-common",\
"powerpc-darwin": "endian-big bit-32 common-darwin",\
- "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\
- "ppc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\
- "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common",\
- "ppc64-linux-gnu": "endian-big bit-64 common-linux common-glibc powerpc-common",\
+ "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
+ "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\
"powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\
- "powerpc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\
- "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common",\
+ "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
"powerpc-linux-uclibc": "endian-big bit-32 common-linux common-uclibc powerpc-common",\
- "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common",\
+ "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\
"sh3-linux": "endian-little bit-32 common-linux common-glibc sh-common",\
- "sh3-linux-gnu": "endian-little bit-32 common-linux common-glibc sh-common",\
"sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\
- "sh4-linux-gnu": "endian-little bit-32 common-linux common-glibc sh-common",\
"sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\
- "sparc-linux": "endian-big bit-32 common-linux common-glibc",\
- "sparc-linux-gnu": "endian-big bit-32 common-linux common-glibc",\
- "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
- "viac3-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\
+ "sparc-linux": "endian-big bit-32 common-linux common-glibc",\
+ "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\
"x86_64-linux": "endian-little bit-64 common-linux common-glibc",\
- "x86_64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\
"x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"}
if target in targetinfo:
info = targetinfo[target].split()
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-20 08:35:16 +0000