diff options
-rw-r--r-- | meta-moblin/classes/moblin.bbclass | 12 | ||||
-rw-r--r-- | meta-moblin/conf/distro/moblin.conf | 115 | ||||
-rw-r--r-- | meta/conf/distro/include/as-needed.inc | 14 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi.inc | 15 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-moblin.inc | 26 | ||||
-rw-r--r-- | meta/conf/distro/include/world-broken.inc | 30 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 30 |
7 files changed, 201 insertions, 41 deletions
diff --git a/meta-moblin/classes/moblin.bbclass b/meta-moblin/classes/moblin.bbclass new file mode 100644 index 0000000..aac6957 --- /dev/null +++ b/meta-moblin/classes/moblin.bbclass @@ -0,0 +1,12 @@ + +PREMIRRORS_append () { +ftp://.*/.* http://pokylinux.org/sources/ +http://.*/.* http://pokylinux.org/sources/ +https://.*/.* http://pokylinux.org/sources/ +} + +MIRRORS_append () { +ftp://.*/.* http://pokylinux.org/sources/ +http://.*/.* http://pokylinux.org/sources/ +https://.*/.* http://pokylinux.org/sources/ +} diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf new file mode 100644 index 0000000..20d96cc --- /dev/null +++ b/meta-moblin/conf/distro/moblin.conf @@ -0,0 +1,115 @@ +DISTRO = "moblin" +DISTRO_NAME = "Moblin (Poky Powered)" +DISTRO_VERSION = "1.99+snapshot-${DATE}" + +MAINTAINER = "Moblin <dev@lists.moblin.org>" + +PACKAGE_CLASSES ?= "package_rpm" +INHERIT_INSANE ?= "insane" +INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging" + +# For some reason, this doesn't work +# TARGET_OS ?= "linux" +# TARGET_VENDOR ?= "-poky" +# Set by POKYMODE instead +TARGET_OS = "linux" + +QA_LOGFILE = "${TMPDIR}/qa.log" + +IMAGE_ROOTFS_SIZE_ext2 ?= "131072" + +# Metadata is git based +#METADATA_REVISION = "${@base_get_metadata_git_revision(d)}" +#FIXME +METADATA_REVISION = "unknown" + +#IPK_FEED_URIS += " \ +# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ +#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ +# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ +# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ +# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ +# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ +# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" + +#RPM_FEED_URIS += " \ +# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ +#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ +# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ +# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ +# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ +# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ +# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" + +OEINCLUDELOGS = "yes" +KERNEL_CONSOLE = "ttyS0" +#DEBUG_OPTIMIZATION = "-O -g3" +#DEBUG_BUILD = "1" +#INHIBIT_PACKAGE_STRIP = "1" + +# Default to TARGETOS values for EABI +GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" + +POKYMODE ?= "moblin" +require conf/distro/include/poky-${POKYMODE}.inc + +POKYLIBC ?= "glibc" +require conf/distro/include/poky-${POKYLIBC}.inc + +SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" +SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" + +CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" + +# +# Preferred providers: +# + +# Virtuals: +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" +PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel + +VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" + +# Others: +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" +PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" +PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" +PREFERRED_PROVIDER_opkg ?= "opkg" + +require conf/distro/include/poky-fixed-revisions.inc +require conf/distro/include/preferred-xorg-versions.inc + +PCMCIA_MANAGER ?= "pcmciautils" + +CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" + +IMAGE_LINGUAS ?= "en-gb" +LIMIT_BUILT_LOCALES ?= "en_GB" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +LOCALE_UTF8_ONLY = "1" + +DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" + +POKY_EXTRA_RDEPENDS = "" +POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" +POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" +POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" +POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" + +DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" + +IMAGE_FEATURES ?= "" + +require conf/distro/include/world-broken.inc diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc new file mode 100644 index 0000000..50a152d --- /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 e0cafba..10706b6 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-moblin.inc b/meta/conf/distro/include/poky-moblin.inc new file mode 100644 index 0000000..45535c5 --- /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 0000000..e1e1488 --- /dev/null +++ b/meta/conf/distro/include/world-broken.inc @@ -0,0 +1,30 @@ +# +# 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" + diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 7be5057..1abafa5 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 |