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 0000000000..aac6957583 --- /dev/null +++ b/meta-moblin/classes/moblin.bbclass | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | |||
| 2 | PREMIRRORS_append () { | ||
| 3 | ftp://.*/.* http://pokylinux.org/sources/ | ||
| 4 | http://.*/.* http://pokylinux.org/sources/ | ||
| 5 | https://.*/.* http://pokylinux.org/sources/ | ||
| 6 | } | ||
| 7 | |||
| 8 | MIRRORS_append () { | ||
| 9 | ftp://.*/.* http://pokylinux.org/sources/ | ||
| 10 | http://.*/.* http://pokylinux.org/sources/ | ||
| 11 | https://.*/.* http://pokylinux.org/sources/ | ||
| 12 | } | ||
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf new file mode 100644 index 0000000000..20d96cc2a6 --- /dev/null +++ b/meta-moblin/conf/distro/moblin.conf | |||
| @@ -0,0 +1,115 @@ | |||
| 1 | DISTRO = "moblin" | ||
| 2 | DISTRO_NAME = "Moblin (Poky Powered)" | ||
| 3 | DISTRO_VERSION = "1.99+snapshot-${DATE}" | ||
| 4 | |||
| 5 | MAINTAINER = "Moblin <dev@lists.moblin.org>" | ||
| 6 | |||
| 7 | PACKAGE_CLASSES ?= "package_rpm" | ||
| 8 | INHERIT_INSANE ?= "insane" | ||
| 9 | INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging" | ||
| 10 | |||
| 11 | # For some reason, this doesn't work | ||
| 12 | # TARGET_OS ?= "linux" | ||
| 13 | # TARGET_VENDOR ?= "-poky" | ||
| 14 | # Set by POKYMODE instead | ||
| 15 | TARGET_OS = "linux" | ||
| 16 | |||
| 17 | QA_LOGFILE = "${TMPDIR}/qa.log" | ||
| 18 | |||
| 19 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | ||
| 20 | |||
| 21 | # Metadata is git based | ||
| 22 | #METADATA_REVISION = "${@base_get_metadata_git_revision(d)}" | ||
| 23 | #FIXME | ||
| 24 | METADATA_REVISION = "unknown" | ||
| 25 | |||
| 26 | #IPK_FEED_URIS += " \ | ||
| 27 | # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ | ||
| 28 | #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ | ||
| 29 | # machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ | ||
| 30 | # base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ | ||
| 31 | # libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ | ||
| 32 | # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ | ||
| 33 | # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" | ||
| 34 | |||
| 35 | #RPM_FEED_URIS += " \ | ||
| 36 | # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ | ||
| 37 | #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ | ||
| 38 | # machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ | ||
| 39 | # base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \ | ||
| 40 | # libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \ | ||
| 41 | # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ | ||
| 42 | # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" | ||
| 43 | |||
| 44 | OEINCLUDELOGS = "yes" | ||
| 45 | KERNEL_CONSOLE = "ttyS0" | ||
| 46 | #DEBUG_OPTIMIZATION = "-O -g3" | ||
| 47 | #DEBUG_BUILD = "1" | ||
| 48 | #INHIBIT_PACKAGE_STRIP = "1" | ||
| 49 | |||
| 50 | # Default to TARGETOS values for EABI | ||
| 51 | GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" | ||
| 52 | UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" | ||
| 53 | |||
| 54 | POKYMODE ?= "moblin" | ||
| 55 | require conf/distro/include/poky-${POKYMODE}.inc | ||
| 56 | |||
| 57 | POKYLIBC ?= "glibc" | ||
| 58 | require conf/distro/include/poky-${POKYLIBC}.inc | ||
| 59 | |||
| 60 | SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" | ||
| 61 | SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" | ||
| 62 | |||
| 63 | CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" | ||
| 64 | |||
| 65 | # | ||
| 66 | # Preferred providers: | ||
| 67 | # | ||
| 68 | |||
| 69 | # Virtuals: | ||
| 70 | PREFERRED_PROVIDER_virtual/db ?= "db" | ||
| 71 | PREFERRED_PROVIDER_virtual/db-native ?= "db-native" | ||
| 72 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" | ||
| 73 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" | ||
| 74 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | ||
| 75 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" | ||
| 76 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | ||
| 77 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" | ||
| 78 | PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel | ||
| 79 | |||
| 80 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" | ||
| 81 | |||
| 82 | # Others: | ||
| 83 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" | ||
| 84 | PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" | ||
| 85 | PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" | ||
| 86 | PREFERRED_PROVIDER_gconf ?= "gconf-dbus" | ||
| 87 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" | ||
| 88 | PREFERRED_PROVIDER_opkg ?= "opkg" | ||
| 89 | |||
| 90 | require conf/distro/include/poky-fixed-revisions.inc | ||
| 91 | require conf/distro/include/preferred-xorg-versions.inc | ||
| 92 | |||
| 93 | PCMCIA_MANAGER ?= "pcmciautils" | ||
| 94 | |||
| 95 | CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" | ||
| 96 | |||
| 97 | IMAGE_LINGUAS ?= "en-gb" | ||
| 98 | LIMIT_BUILT_LOCALES ?= "en_GB" | ||
| 99 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" | ||
| 100 | LOCALE_UTF8_ONLY = "1" | ||
| 101 | |||
| 102 | DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" | ||
| 103 | |||
| 104 | POKY_EXTRA_RDEPENDS = "" | ||
| 105 | POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" | ||
| 106 | POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" | ||
| 107 | POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" | ||
| 108 | POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" | ||
| 109 | |||
| 110 | DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" | ||
| 111 | DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" | ||
| 112 | |||
| 113 | IMAGE_FEATURES ?= "" | ||
| 114 | |||
| 115 | 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 0000000000..50a152de32 --- /dev/null +++ b/meta/conf/distro/include/as-needed.inc | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | |||
| 2 | ASNEEDED = "-Wl,--as-needed" | ||
| 3 | |||
| 4 | ASNEEDED_pn-console-tools = "" | ||
| 5 | ASNEEDED_pn-distcc = "" | ||
| 6 | ASNEEDED_pn-openobex = "" | ||
| 7 | ASNEEDED_pn-icu = "" | ||
| 8 | ASNEEDED_pn-xserver-kdrive-xomap = "" | ||
| 9 | ASNEEDED_pn-minimo = "" | ||
| 10 | ASNEEDED_pn-pciutils = "" | ||
| 11 | ASNEEDED_pn-puzzles = "" | ||
| 12 | ASNEEDED_pn-dialer = "" | ||
| 13 | |||
| 14 | 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 e0cafbaaa9..10706b695c 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" | |||
| 35 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" | 35 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" |
| 36 | PREFERRED_VERSION_elfutils ?= "0.131" | 36 | PREFERRED_VERSION_elfutils ?= "0.131" |
| 37 | 37 | ||
| 38 | ASNEEDED = "-Wl,--as-needed" | 38 | require conf/distro/include/as-needed.inc |
| 39 | ASNEEDED_pn-console-tools = "" | 39 | |
| 40 | ASNEEDED_pn-distcc = "" | 40 | |
| 41 | ASNEEDED_pn-openobex = "" | ||
| 42 | ASNEEDED_pn-icu = "" | ||
| 43 | ASNEEDED_pn-xserver-kdrive-xomap = "" | ||
| 44 | ASNEEDED_pn-minimo = "" | ||
| 45 | ASNEEDED_pn-pciutils = "" | ||
| 46 | ASNEEDED_pn-puzzles = "" | ||
| 47 | ASNEEDED_pn-dialer = "" | ||
| 48 | |||
| 49 | TARGET_LDFLAGS += "${ASNEEDED}" | ||
diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc new file mode 100644 index 0000000000..45535c5540 --- /dev/null +++ b/meta/conf/distro/include/poky-moblin.inc | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | TARGET_VENDOR = "-poky" | ||
| 2 | |||
| 3 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" | ||
| 4 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" | ||
| 5 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" | ||
| 6 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" | ||
| 7 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" | ||
| 8 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" | ||
| 9 | |||
| 10 | GCCVERSION ?= "4.2.3" | ||
| 11 | BINUVERSION = "2.18" | ||
| 12 | |||
| 13 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | ||
| 14 | PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" | ||
| 15 | PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" | ||
| 16 | PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" | ||
| 17 | PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}" | ||
| 18 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" | ||
| 19 | PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" | ||
| 20 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.24" | ||
| 21 | PREFERRED_VERSION_glibc ?= "2.6.1" | ||
| 22 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" | ||
| 23 | PREFERRED_VERSION_elfutils ?= "0.131" | ||
| 24 | |||
| 25 | require conf/distro/include/as-needed.inc | ||
| 26 | |||
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc new file mode 100644 index 0000000000..e1e14880fc --- /dev/null +++ b/meta/conf/distro/include/world-broken.inc | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | # | ||
| 2 | # Exclude known broken packages | ||
| 3 | # | ||
| 4 | # Needs old OpenSync | ||
| 5 | EXCLUDE_FROM_WORLD_pn-libsync = "1" | ||
| 6 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1" | ||
| 7 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" | ||
| 8 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1" | ||
| 9 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" | ||
| 10 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1" | ||
| 11 | # Needs python | ||
| 12 | EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" | ||
| 13 | # Needs gcc 3.x | ||
| 14 | EXCLUDE_FROM_WORLD_pn-qemu = "1" | ||
| 15 | # temporary | ||
| 16 | EXCLUDE_FROM_WORLD_pn-lirc = "1" | ||
| 17 | EXCLUDE_FROM_WORLD_pn-lirc-modules = "1" | ||
| 18 | # these applications need clutter 0.6 | ||
| 19 | EXCLUDE_FROM_WORLD_pn-aaina = "1" | ||
| 20 | EXCLUDE_FROM_WORLD_pn-table = "1" | ||
| 21 | EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1" | ||
| 22 | # Need bzr | ||
| 23 | EXCLUDE_FROM_WORLD_pn-eds-tools = "1" | ||
| 24 | # Need fixed Perl - OE bug #3403 | ||
| 25 | EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1" | ||
| 26 | # Needs libxml-parser-perl | ||
| 27 | EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1" | ||
| 28 | # Needs gtk+ <= 2.10 | ||
| 29 | EXCLUDE_FROM_WORLD_pn-gcalctool = "1" | ||
| 30 | |||
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 7be505765f..1abafa5d22 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
| @@ -116,33 +116,5 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" | |||
| 116 | 116 | ||
| 117 | IMAGE_FEATURES ?= "" | 117 | IMAGE_FEATURES ?= "" |
| 118 | 118 | ||
| 119 | # | 119 | require conf/distro/include/world-broken.inc |
| 120 | # Exclude known broken packages | ||
| 121 | # | ||
| 122 | # Needs old OpenSync | ||
| 123 | EXCLUDE_FROM_WORLD_pn-libsync = "1" | ||
| 124 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1" | ||
| 125 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" | ||
| 126 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1" | ||
| 127 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" | ||
| 128 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1" | ||
| 129 | # Needs python | ||
| 130 | EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" | ||
| 131 | # Needs gcc 3.x | ||
| 132 | EXCLUDE_FROM_WORLD_pn-qemu = "1" | ||
| 133 | # temporary | ||
| 134 | EXCLUDE_FROM_WORLD_pn-lirc = "1" | ||
| 135 | EXCLUDE_FROM_WORLD_pn-lirc-modules = "1" | ||
| 136 | # these applications need clutter 0.6 | ||
| 137 | EXCLUDE_FROM_WORLD_pn-aaina = "1" | ||
| 138 | EXCLUDE_FROM_WORLD_pn-table = "1" | ||
| 139 | EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1" | ||
| 140 | # Need bzr | ||
| 141 | EXCLUDE_FROM_WORLD_pn-eds-tools = "1" | ||
| 142 | # Need fixed Perl - OE bug #3403 | ||
| 143 | EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1" | ||
| 144 | # Needs libxml-parser-perl | ||
| 145 | EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1" | ||
| 146 | # Needs gtk+ <= 2.10 | ||
| 147 | EXCLUDE_FROM_WORLD_pn-gcalctool = "1" | ||
| 148 | 120 | ||
