diff options
-rw-r--r-- | handbook/Makefile | 3 | ||||
-rw-r--r-- | handbook/ref-variables.xml | 7 | ||||
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.33.2/defconfig-netbook | 8 | ||||
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin_2.6.33.2.bb | 2 | ||||
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/poky.bbclass | 17 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc.conf | 1 | ||||
-rw-r--r-- | meta/packages/gnome/gnome-keyring_2.26.1.bb | 2 | ||||
-rw-r--r-- | meta/packages/gypsy/gypsy_0.6.bb | 2 | ||||
-rw-r--r-- | meta/packages/icu/icu-3.6.inc | 7 | ||||
-rw-r--r-- | meta/packages/tasks/task-poky-tools.bb | 3 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch | 12 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb | 5 | ||||
-rw-r--r-- | meta/site/powerpc-linux | 4 |
15 files changed, 60 insertions, 17 deletions
diff --git a/handbook/Makefile b/handbook/Makefile index 5dff1a8742..502c951a7a 100644 --- a/handbook/Makefile +++ b/handbook/Makefile | |||
@@ -9,7 +9,8 @@ pdf: | |||
9 | XSLTOPTS = --stringparam html.stylesheet style.css \ | 9 | XSLTOPTS = --stringparam html.stylesheet style.css \ |
10 | --stringparam chapter.autolabel 1 \ | 10 | --stringparam chapter.autolabel 1 \ |
11 | --stringparam appendix.autolabel 1 \ | 11 | --stringparam appendix.autolabel 1 \ |
12 | --stringparam section.autolabel 1 | 12 | --stringparam section.autolabel 1 \ |
13 | --xinclude | ||
13 | 14 | ||
14 | ## | 15 | ## |
15 | # These URI should be rewritten by your distribution's xml catalog to | 16 | # These URI should be rewritten by your distribution's xml catalog to |
diff --git a/handbook/ref-variables.xml b/handbook/ref-variables.xml index e4523bfdc1..7aa360660b 100644 --- a/handbook/ref-variables.xml +++ b/handbook/ref-variables.xml | |||
@@ -84,6 +84,13 @@ | |||
84 | </glossdef> | 84 | </glossdef> |
85 | </glossentry> | 85 | </glossentry> |
86 | 86 | ||
87 | <glossentry id='var-BPN'><glossterm>BPN</glossterm> | ||
88 | <glossdef> | ||
89 | <para>Bare name of package with any suffixes like -cross -native | ||
90 | removed. </para> | ||
91 | </glossdef> | ||
92 | </glossentry> | ||
93 | |||
87 | </glossdiv> | 94 | </glossdiv> |
88 | 95 | ||
89 | <glossdiv id='var-glossary-c'><title>C</title> | 96 | <glossdiv id='var-glossary-c'><title>C</title> |
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/defconfig-netbook b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/defconfig-netbook index b36e9a0b6d..56ca00d6bf 100644 --- a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/defconfig-netbook +++ b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/defconfig-netbook | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.33.2 | 3 | # Linux kernel version: 2.6.33.2 |
4 | # Mon Jun 7 22:35:35 2010 | 4 | # Thu Jun 10 18:03:03 2010 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -1460,14 +1460,14 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
1460 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 1460 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
1461 | # CONFIG_MOUSE_PS2_SENTELIC is not set | 1461 | # CONFIG_MOUSE_PS2_SENTELIC is not set |
1462 | CONFIG_MOUSE_PS2_TOUCHKIT=y | 1462 | CONFIG_MOUSE_PS2_TOUCHKIT=y |
1463 | CONFIG_MOUSE_SERIAL=m | 1463 | # CONFIG_MOUSE_SERIAL is not set |
1464 | # CONFIG_MOUSE_APPLETOUCH is not set | 1464 | # CONFIG_MOUSE_APPLETOUCH is not set |
1465 | # CONFIG_MOUSE_BCM5974 is not set | 1465 | # CONFIG_MOUSE_BCM5974 is not set |
1466 | # CONFIG_MOUSE_INPORT is not set | 1466 | # CONFIG_MOUSE_INPORT is not set |
1467 | # CONFIG_MOUSE_LOGIBM is not set | 1467 | # CONFIG_MOUSE_LOGIBM is not set |
1468 | # CONFIG_MOUSE_PC110PAD is not set | 1468 | # CONFIG_MOUSE_PC110PAD is not set |
1469 | CONFIG_MOUSE_VSXXXAA=m | 1469 | CONFIG_MOUSE_VSXXXAA=y |
1470 | # CONFIG_MOUSE_SYNAPTICS_I2C is not set | 1470 | CONFIG_MOUSE_SYNAPTICS_I2C=y |
1471 | CONFIG_INPUT_JOYSTICK=y | 1471 | CONFIG_INPUT_JOYSTICK=y |
1472 | # CONFIG_JOYSTICK_ANALOG is not set | 1472 | # CONFIG_JOYSTICK_ANALOG is not set |
1473 | # CONFIG_JOYSTICK_A3D is not set | 1473 | # CONFIG_JOYSTICK_A3D is not set |
diff --git a/meta-moblin/packages/linux/linux-moblin_2.6.33.2.bb b/meta-moblin/packages/linux/linux-moblin_2.6.33.2.bb index d0128e3da7..fbb456adff 100644 --- a/meta-moblin/packages/linux/linux-moblin_2.6.33.2.bb +++ b/meta-moblin/packages/linux/linux-moblin_2.6.33.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require linux-moblin.inc | 1 | require linux-moblin.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | DEFAULT_PREFERENCE = "-1" | 5 | DEFAULT_PREFERENCE = "-1" |
6 | DEFAULT_PREFERENCE_netbook = "1" | 6 | DEFAULT_PREFERENCE_netbook = "1" |
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 6314e36aa7..bd2dc1652c 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -42,7 +42,7 @@ python () { | |||
42 | path = bb.data.getVar('PSTAGE_PKGPATH', d, 1) | 42 | path = bb.data.getVar('PSTAGE_PKGPATH', d, 1) |
43 | path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-') | 43 | path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-') |
44 | bb.data.setVar('PSTAGE_PKGPATH', path, d) | 44 | bb.data.setVar('PSTAGE_PKGPATH', path, d) |
45 | scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMDPDIR_STAGE}" | 45 | scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}" |
46 | bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d) | 46 | bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d) |
47 | 47 | ||
48 | # PSTAGE_NATIVEDEPENDS lists the packages we need before we can use packaged | 48 | # PSTAGE_NATIVEDEPENDS lists the packages we need before we can use packaged |
diff --git a/meta/classes/poky.bbclass b/meta/classes/poky.bbclass index cf65b6ceb1..7d3c28ffe2 100644 --- a/meta/classes/poky.bbclass +++ b/meta/classes/poky.bbclass | |||
@@ -7,10 +7,23 @@ osc://.*/.* http://pokylinux.org/sources/ | |||
7 | p4://.*/.* http://pokylinux.org/sources/ | 7 | p4://.*/.* http://pokylinux.org/sources/ |
8 | svk://.*/.* http://pokylinux.org/sources/ | 8 | svk://.*/.* http://pokylinux.org/sources/ |
9 | svn://.*/.* http://pokylinux.org/sources/ | 9 | svn://.*/.* http://pokylinux.org/sources/ |
10 | |||
11 | bzr://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
12 | cvs://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
13 | git://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
14 | hg://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
15 | osc://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
16 | p4://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
17 | svk://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
18 | svn://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
10 | } | 19 | } |
11 | 20 | ||
12 | MIRRORS_append () { | 21 | MIRRORS_append () { |
13 | ftp://.*/.* http://pokylinux.org/sources/ | 22 | ftp://.*/.* http://pokylinux.org/sources/ |
14 | http://.*/.* http://pokylinux.org/sources/ | 23 | http://.*/.* http://pokylinux.org/sources/ |
15 | https://.*/.* http://pokylinux.org/sources/ | 24 | https://.*/.* http://pokylinux.org/sources/ |
25 | |||
26 | ftp://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
27 | http://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
28 | https://.*/.* http://autobuilder.pokylinux.org/sources/ | ||
16 | } | 29 | } |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index ddebebb286..e0f33e29c7 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | DISTRO = "poky" | 4 | DISTRO = "poky" |
5 | DISTRO_NAME = "OpenedHand Linux (Poky)" | 5 | DISTRO_NAME = "OpenedHand Linux (Poky)" |
6 | DISTRO_VERSION = "3.2+snapshot-${DATE}" | 6 | DISTRO_VERSION = "3.3+snapshot-${DATE}" |
7 | 7 | ||
8 | MAINTAINER = "OpenedHand <poky@openedhand.com>" | 8 | MAINTAINER = "OpenedHand <poky@openedhand.com>" |
9 | 9 | ||
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 91abb0792a..6ca8ce8d26 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
@@ -3,6 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation | 3 | #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation |
4 | 4 | ||
5 | TARGET_ARCH = "powerpc" | 5 | TARGET_ARCH = "powerpc" |
6 | PACKAGE_EXTRA_ARCHS = "ppc603e" | ||
6 | 7 | ||
7 | require conf/machine/include/qemu.inc | 8 | require conf/machine/include/qemu.inc |
8 | require conf/machine/include/tune-ppc603e.inc | 9 | require conf/machine/include/tune-ppc603e.inc |
diff --git a/meta/packages/gnome/gnome-keyring_2.26.1.bb b/meta/packages/gnome/gnome-keyring_2.26.1.bb index cc111c9498..6d1e335291 100644 --- a/meta/packages/gnome/gnome-keyring_2.26.1.bb +++ b/meta/packages/gnome/gnome-keyring_2.26.1.bb | |||
@@ -5,7 +5,7 @@ PR = "r1" | |||
5 | 5 | ||
6 | inherit autotools gnome pkgconfig | 6 | inherit autotools gnome pkgconfig |
7 | 7 | ||
8 | DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native" | 8 | DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" |
9 | 9 | ||
10 | EXTRA_OECONF = "--disable-gtk-doc" | 10 | EXTRA_OECONF = "--disable-gtk-doc" |
11 | 11 | ||
diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/packages/gypsy/gypsy_0.6.bb index bd2fdaa0dd..ee669e5ef4 100644 --- a/meta/packages/gypsy/gypsy_0.6.bb +++ b/meta/packages/gypsy/gypsy_0.6.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "GPL" | |||
3 | SECTION = "x11" | 3 | SECTION = "x11" |
4 | DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt" | 4 | DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt" |
5 | 5 | ||
6 | SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" | 6 | SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz" |
7 | 7 | ||
8 | inherit autotools pkgconfig | 8 | inherit autotools pkgconfig |
9 | 9 | ||
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index e99fc4a202..9761908bd0 100644 --- a/meta/packages/icu/icu-3.6.inc +++ b/meta/packages/icu/icu-3.6.inc | |||
@@ -1,8 +1,11 @@ | |||
1 | 1 | ||
2 | SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ | 2 | BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ |
3 | file://gccfix.patch;patch=1 \ | 3 | file://gccfix.patch;patch=1 \ |
4 | file://noldlibpath.patch;patch=1 \ | ||
5 | file://use-g++-for-linking.patch;patch=1" | 4 | file://use-g++-for-linking.patch;patch=1" |
5 | SRC_URI = "${BASE_SRC_URI} \ | ||
6 | file://noldlibpath.patch;patch=1" | ||
7 | SRC_URI_virtclass-native = "${BASE_SRC_URI}" | ||
8 | |||
6 | LICENSE = "ICU" | 9 | LICENSE = "ICU" |
7 | DEPENDS = "icu-native" | 10 | DEPENDS = "icu-native" |
8 | DEPENDS_virtclass-native = "" | 11 | DEPENDS_virtclass-native = "" |
diff --git a/meta/packages/tasks/task-poky-tools.bb b/meta/packages/tasks/task-poky-tools.bb index cb90718332..4b6d218149 100644 --- a/meta/packages/tasks/task-poky-tools.bb +++ b/meta/packages/tasks/task-poky-tools.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Tools tasks for Poky" | 5 | DESCRIPTION = "Tools tasks for Poky" |
6 | PR = "r2" | 6 | PR = "r3" |
7 | 7 | ||
8 | PACKAGES = "\ | 8 | PACKAGES = "\ |
9 | task-poky-tools-debug \ | 9 | task-poky-tools-debug \ |
@@ -25,6 +25,7 @@ ALLOW_EMPTY = "1" | |||
25 | KEXECTOOLS ?= "kexec-tools" | 25 | KEXECTOOLS ?= "kexec-tools" |
26 | KEXECTOOLS_mips ?= "" | 26 | KEXECTOOLS_mips ?= "" |
27 | KEXECTOOLS_mipsel ?= "" | 27 | KEXECTOOLS_mipsel ?= "" |
28 | KEXECTOOLS_powerpc ?= "" | ||
28 | 29 | ||
29 | RDEPENDS_task-poky-tools-debug = "\ | 30 | RDEPENDS_task-poky-tools-debug = "\ |
30 | gdb \ | 31 | gdb \ |
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch new file mode 100644 index 0000000000..6b34032a39 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: git/configure.ac | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 | ||
4 | +++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 | ||
5 | @@ -62,7 +62,6 @@ | ||
6 | AC_LIBTOOL_WIN32_DLL | ||
7 | AC_DISABLE_STATIC | ||
8 | AC_PROG_LIBTOOL | ||
9 | -DOLT | ||
10 | AC_PROG_MAKE_SET | ||
11 | PKG_PROG_PKG_CONFIG | ||
12 | AC_PROG_LEX | ||
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb index f0fb6e2d1f..7ca88e64e2 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb | |||
@@ -7,7 +7,7 @@ RDEPENDS_${PN} += "xkeyboard-config" | |||
7 | EXTRA_OECONF += "--disable-glx" | 7 | EXTRA_OECONF += "--disable-glx" |
8 | 8 | ||
9 | PE = "1" | 9 | PE = "1" |
10 | PR = "r24" | 10 | PR = "r25" |
11 | 11 | ||
12 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | 12 | SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ |
13 | file://extra-kmodes.patch;patch=1 \ | 13 | file://extra-kmodes.patch;patch=1 \ |
@@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ | |||
22 | file://hide-cursor-and-ppm-root.patch;patch=1 \ | 22 | file://hide-cursor-and-ppm-root.patch;patch=1 \ |
23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ | 23 | file://fbdev_xrandr_ioctl.patch;patch=1 \ |
24 | file://fix-newer-xorg-headers.patch;patch=1 \ | 24 | file://fix-newer-xorg-headers.patch;patch=1 \ |
25 | file://crosscompile.patch;patch=1" | 25 | file://crosscompile.patch;patch=1 \ |
26 | file://nodolt.patch;patch=1" | ||
26 | 27 | ||
27 | S = "${WORKDIR}/xorg-server-${PV}" | 28 | S = "${WORKDIR}/xorg-server-${PV}" |
diff --git a/meta/site/powerpc-linux b/meta/site/powerpc-linux index bea14d5a75..856701d17d 100644 --- a/meta/site/powerpc-linux +++ b/meta/site/powerpc-linux | |||
@@ -3,3 +3,7 @@ libc_cv_ppc_machine=${libc_cv_ppc_machine=yes} | |||
3 | libc_cv_mlong_double_128ibm=${libc_cv_mlong_double_128ibm=yes} | 3 | libc_cv_mlong_double_128ibm=${libc_cv_mlong_double_128ibm=yes} |
4 | libc_cv_mabi_ibmlongdouble=${libc_cv_mabi_ibmlongdouble=yes} | 4 | libc_cv_mabi_ibmlongdouble=${libc_cv_mabi_ibmlongdouble=yes} |
5 | libc_cv_mlong_double_128=${libc_cv_mlong_double_128=yes} | 5 | libc_cv_mlong_double_128=${libc_cv_mlong_double_128=yes} |
6 | |||
7 | # popt | ||
8 | ac_cv_va_copy=${ac_cv_va_copy=yes} | ||
9 | ac_cv___va_copy=${ac_cv___va_copy=yes} | ||