summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/kernel.bbclass4
-rw-r--r--meta/classes/package_rpm.bbclass2
-rw-r--r--meta/conf/distro/include/as-needed.inc14
-rw-r--r--meta/conf/distro/include/poky-eabi.inc15
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/conf/distro/include/poky-moblin.inc26
-rw-r--r--meta/conf/distro/include/world-broken.inc36
-rw-r--r--meta/conf/distro/poky.conf30
-rw-r--r--meta/packages/gtk+/gtk+.inc1
-rw-r--r--meta/packages/helix/helix-libs.bb2
-rw-r--r--meta/packages/helix/ribosome.bb2
-rw-r--r--meta/packages/images/poky-image-netbook-install.bb9
-rw-r--r--meta/packages/images/poky-image-netbook-live.bb9
-rw-r--r--meta/packages/images/poky-image-netbook.bb7
-rw-r--r--meta/packages/images/poky-image-sdk-live.bb9
16 files changed, 101 insertions, 69 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 239d93723..8407cdd56 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -4,6 +4,8 @@ LICENSE = "MIT"
PACKAGES = ""
RDEPENDS += "${IMAGE_INSTALL}"
+INHIBIT_DEFAULT_DEPS = "1"
+
# "export IMAGE_BASENAME" not supported at this time
IMAGE_BASENAME[export] = "1"
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 059f787eb..b2266bee5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -452,7 +452,9 @@ do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
- tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+ if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
+ tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+ fi
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 3defcdde7..d291733dc 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -147,7 +147,7 @@ python write_specfile() {
rpm_prep() {
if [ ! -e ${WORKDIR}/rpmrc ]; then
mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
- echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
+ echo 'macrofiles:${STAGING_DIR_NATIVE}/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
fi
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
new file mode 100644
index 000000000..50a152de3
--- /dev/null
+++ b/meta/conf/distro/include/as-needed.inc
@@ -0,0 +1,14 @@
+
+ASNEEDED = "-Wl,--as-needed"
+
+ASNEEDED_pn-console-tools = ""
+ASNEEDED_pn-distcc = ""
+ASNEEDED_pn-openobex = ""
+ASNEEDED_pn-icu = ""
+ASNEEDED_pn-xserver-kdrive-xomap = ""
+ASNEEDED_pn-minimo = ""
+ASNEEDED_pn-pciutils = ""
+ASNEEDED_pn-puzzles = ""
+ASNEEDED_pn-dialer = ""
+
+TARGET_LDFLAGS += "${ASNEEDED}" \ No newline at end of file
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index e0cafbaaa..10706b695 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -35,15 +35,6 @@ PREFERRED_VERSION_glibc ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_elfutils ?= "0.131"
-ASNEEDED = "-Wl,--as-needed"
-ASNEEDED_pn-console-tools = ""
-ASNEEDED_pn-distcc = ""
-ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-icu = ""
-ASNEEDED_pn-xserver-kdrive-xomap = ""
-ASNEEDED_pn-minimo = ""
-ASNEEDED_pn-pciutils = ""
-ASNEEDED_pn-puzzles = ""
-ASNEEDED_pn-dialer = ""
-
-TARGET_LDFLAGS += "${ASNEEDED}"
+require conf/distro/include/as-needed.inc
+
+
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 936b07f62..94188334d 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -65,7 +65,7 @@ SRCREV_pn-matchbox-config-gtk ?= "1614"
SRCREV_pn-matchbox-desktop-sato ?= "76"
SRCREV_pn-matchbox-desktop ?= "2084"
SRCREV_pn-matchbox-keyboard ?= "1910"
-SRCREV_pn-matchbox-panel-2 ?= "2086"
+SRCREV_pn-matchbox-panel-2 ?= "2088"
SRCREV_pn-matchbox-panel ?= "1364"
SRCREV_pn-matchbox-stroke ?= "1524"
SRCREV_pn-matchbox-terminal ?= "1612"
diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc
new file mode 100644
index 000000000..45535c554
--- /dev/null
+++ b/meta/conf/distro/include/poky-moblin.inc
@@ -0,0 +1,26 @@
+TARGET_VENDOR = "-poky"
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+GCCVERSION ?= "4.2.3"
+BINUVERSION = "2.18"
+
+PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}"
+PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
+PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.24"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_elfutils ?= "0.131"
+
+require conf/distro/include/as-needed.inc
+
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc
new file mode 100644
index 000000000..c1dc7f573
--- /dev/null
+++ b/meta/conf/distro/include/world-broken.inc
@@ -0,0 +1,36 @@
+#
+# Exclude known broken packages
+#
+# Needs old OpenSync
+EXCLUDE_FROM_WORLD_pn-libsync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1"
+EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1"
+# Needs python
+EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
+# Needs gcc 3.x
+EXCLUDE_FROM_WORLD_pn-qemu = "1"
+# temporary
+EXCLUDE_FROM_WORLD_pn-lirc = "1"
+EXCLUDE_FROM_WORLD_pn-lirc-modules = "1"
+# these applications need clutter 0.6
+EXCLUDE_FROM_WORLD_pn-aaina = "1"
+EXCLUDE_FROM_WORLD_pn-table = "1"
+EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1"
+# Need bzr
+EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
+# Need fixed Perl - OE bug #3403
+EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1"
+# Needs libxml-parser-perl
+EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1"
+# Needs gtk+ <= 2.10
+EXCLUDE_FROM_WORLD_pn-gcalctool = "1"
+
+# The packages from these clash atm
+EXCLUDE_FROM_WORLD_pn-abiword = "1"
+EXCLUDE_FROM_WORLD_pn-abiword-embedded = "1"
+
+# helix is x86 only
+EXCLUDE_FROM_WORLD_pn-clutter-helix = "1"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a6591bdad..4b2043836 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -116,33 +116,5 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
IMAGE_FEATURES ?= ""
-#
-# Exclude known broken packages
-#
-# Needs old OpenSync
-EXCLUDE_FROM_WORLD_pn-libsync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1"
-EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1"
-# Needs python
-EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
-# Needs gcc 3.x
-EXCLUDE_FROM_WORLD_pn-qemu = "1"
-# temporary
-EXCLUDE_FROM_WORLD_pn-lirc = "1"
-EXCLUDE_FROM_WORLD_pn-lirc-modules = "1"
-# these applications need clutter 0.6
-EXCLUDE_FROM_WORLD_pn-aaina = "1"
-EXCLUDE_FROM_WORLD_pn-table = "1"
-EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1"
-# Need bzr
-EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
-# Need fixed Perl - OE bug #3403
-EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1"
-# Needs libxml-parser-perl
-EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1"
-# Needs gtk+ <= 2.10
-EXCLUDE_FROM_WORLD_pn-gcalctool = "1"
+require conf/distro/include/world-broken.inc
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index 9a767e29c..c3f454829 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -34,6 +34,7 @@ FILES_${PN}-dbg += " \
BASE_RRECOMMENDS = "ttf-dejavu-sans"
BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
+BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1"
diff --git a/meta/packages/helix/helix-libs.bb b/meta/packages/helix/helix-libs.bb
index 83c9d8139..604ec622c 100644
--- a/meta/packages/helix/helix-libs.bb
+++ b/meta/packages/helix/helix-libs.bb
@@ -19,6 +19,8 @@ export BUILDRC=${BUILD_ROOT}/buildrc
export SYSTEM_ID=linux-2.2-libc6-gcc32-i586
export BUILD=$BUILD_ROOT/bin/build.py
+COMPATIBLE_HOST = '(i.86.*-linux)'
+
do_compile() {
${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
}
diff --git a/meta/packages/helix/ribosome.bb b/meta/packages/helix/ribosome.bb
index 4339a6ce4..840fc855e 100644
--- a/meta/packages/helix/ribosome.bb
+++ b/meta/packages/helix/ribosome.bb
@@ -16,6 +16,8 @@ SRC_URI = "${_TARBALL_SERVER}/ribosome-${_SNAPSHOT}.tar.bz2 \
S = "${WORKDIR}"
+COMPATIBLE_HOST = '(i.86.*-linux)'
+
do_stage() {
# Install build system of doom
install -d ${STAGING_DIR_HOST}${libdir}
diff --git a/meta/packages/images/poky-image-netbook-install.bb b/meta/packages/images/poky-image-netbook-install.bb
deleted file mode 100644
index ac7dc63e2..000000000
--- a/meta/packages/images/poky-image-netbook-install.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-netbook-live.bb b/meta/packages/images/poky-image-netbook-live.bb
deleted file mode 100644
index a3bfbfc71..000000000
--- a/meta/packages/images/poky-image-netbook-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-netbook.bb b/meta/packages/images/poky-image-netbook.bb
deleted file mode 100644
index 8138e9d59..000000000
--- a/meta/packages/images/poky-image-netbook.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
-
-inherit poky-image
diff --git a/meta/packages/images/poky-image-sdk-live.bb b/meta/packages/images/poky-image-sdk-live.bb
new file mode 100644
index 000000000..807de392a
--- /dev/null
+++ b/meta/packages/images/poky-image-sdk-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Bootable Live SDK Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-sdk:do_rootfs"
generated by cgit v1.2.3 (git 2.46.0) at 2025-01-11 00:23:28 +0000