From 209e018012adb3c06aad0f77c5d444464cf39864 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 10 Jul 2007 07:16:46 +0000 Subject: gcc-csl-arm-2005q3: Added patch to support big-endian builds of 3.4.4 --- packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch | 12 ++++++++++++ packages/gcc/gcc_csl-arm-2005q3.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch (limited to 'packages') diff --git a/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch new file mode 100644 index 0000000000..e6cc42bb65 --- /dev/null +++ b/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch @@ -0,0 +1,12 @@ +--- gcc-2005q3/gcc/config/arm/linux-eabi.h~ 2007-07-10 09:19:47.000000000 +0930 ++++ gcc-2005q3/gcc/config/arm/linux-eabi.h 2007-07-10 10:42:37.000000000 +0930 +@@ -48,7 +48,8 @@ + #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi + + #undef SUBTARGET_EXTRA_LINK_SPEC +-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi" ++#define SUBTARGET_EXTRA_LINK_SPEC \ ++ " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} " + + /* Use ld-linux.so.3 so that it will be possible to run "classic" + GNU/Linux binaries on an EABI system. */ diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index d1053dad1d..4f41ca06af 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -13,7 +13,8 @@ inherit autotools gettext require gcc-package.inc SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ - file://gcc_optab_arm.patch;patch=1" + file://gcc_optab_arm.patch;patch=1 \ + file://gcc-3.4.4-eabi-bigendian.patch;patch=1" do_unpack2() { cd ${WORKDIR} -- cgit v1.2.3 From 9612af5dc0ec7de0b8583a8f63bee0e30a033460 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 10 Jul 2007 07:17:25 +0000 Subject: fsg3-kernel: Update to latest svn defconfig --- packages/linux/fsg3-kernel_2.6.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/fsg3-kernel_2.6.18.bb b/packages/linux/fsg3-kernel_2.6.18.bb index 2e9991f548..5c6688a0af 100644 --- a/packages/linux/fsg3-kernel_2.6.18.bb +++ b/packages/linux/fsg3-kernel_2.6.18.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "898" +IXP4XX_KERNEL_SVN_REV = "902" # # The directory containing the patches to be applied is # specified below -- cgit v1.2.3 From 8bd59599aecdf2b133dabfb0bd5e65f2bac4eb90 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 10 Jul 2007 10:46:22 +0000 Subject: glib-2.0: fix packaging in 2.12.12 - should end discussion on OE list --- packages/glib-2.0/glib-2.0_2.12.12.bb | 2 +- packages/glib-2.0/glib.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/glib-2.0/glib-2.0_2.12.12.bb b/packages/glib-2.0/glib-2.0_2.12.12.bb index 974081afce..2e5259073a 100644 --- a/packages/glib-2.0/glib-2.0_2.12.12.bb +++ b/packages/glib-2.0/glib-2.0_2.12.12.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc index 7abd755891..3fa6fe26ab 100644 --- a/packages/glib-2.0/glib.inc +++ b/packages/glib-2.0/glib.inc @@ -10,10 +10,11 @@ DEPENDS += "glib-2.0-native gtk-doc" DEPENDS += "virtual/libiconv virtual/libintl" PACKAGES =+ " glib-2.0-utils " -PR = "r1" +PR = "r2" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +FILES_${PN} = "${libdir}/lib*so.*" FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0" EXTRA_OECONF = "--disable-debug " -- cgit v1.2.3 From 72159e4645ae57e4e1fa0cd178e9146e89db6469 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 10 Jul 2007 11:02:40 +0000 Subject: parted 1.8.7: Set DEFAULT_PREFERENCE = "-1", requires autoconf 2.61 to be built properly. * Requires autoconf 2.61. Without it, will build, but there will be link errors when some other package will link against libparted. This is actually due to fact that autoconf 2.61 doesn't want to source OE site files. See #2633, $2634. --- packages/parted/parted_1.8.7.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/parted/parted_1.8.7.bb b/packages/parted/parted_1.8.7.bb index f29771d5a4..dcb3ad7cb4 100644 --- a/packages/parted/parted_1.8.7.bb +++ b/packages/parted/parted_1.8.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv2" SECTION = "console/tools" DEPENDS = "readline e2fsprogs-libs" -PR = "r0" +PR = "r1" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" @@ -20,3 +20,8 @@ do_configure() { do_stage() { autotools_stage_all } + +# Requires autoconf 2.61. Without it, will build, but there +# will be link errors when some other package will link against +# libparted. +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 2c83f24a420498c5f63f05e7d95ef0cff4814970 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 10 Jul 2007 14:13:57 +0000 Subject: autoconf_2.61.bb : fix a "bug" in autoconf where it treated CONFIG_SITE as a single filename instead of splitting it into individual filenames. This stopped autoconf 2.61 loading the site files. --- packages/autoconf/autoconf-2.61/config-site.patch | 13 +++++++++++++ packages/autoconf/autoconf_2.61.bb | 1 + 2 files changed, 14 insertions(+) create mode 100644 packages/autoconf/autoconf-2.61/config-site.patch (limited to 'packages') diff --git a/packages/autoconf/autoconf-2.61/config-site.patch b/packages/autoconf/autoconf-2.61/config-site.patch new file mode 100644 index 0000000000..0fa49720c1 --- /dev/null +++ b/packages/autoconf/autoconf-2.61/config-site.patch @@ -0,0 +1,13 @@ +Index: autoconf-2.61/lib/autoconf/general.m4 +=================================================================== +--- autoconf-2.61.orig/lib/autoconf/general.m4 2007-07-10 15:09:01.000000000 +0100 ++++ autoconf-2.61/lib/autoconf/general.m4 2007-07-10 15:09:17.000000000 +0100 +@@ -1767,7 +1767,7 @@ + m4_define([AC_SITE_LOAD], + [# Prefer explicitly selected file to automatically selected ones. + if test -n "$CONFIG_SITE"; then +- set x "$CONFIG_SITE" ++ set x $CONFIG_SITE + elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" + else diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb index 370315f041..e6a452c9a0 100644 --- a/packages/autoconf/autoconf_2.61.bb +++ b/packages/autoconf/autoconf_2.61.bb @@ -8,6 +8,7 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \ file://autoreconf-foreign.patch;patch=1 \ file://autoreconf-gnuconfigize.patch;patch=1 \ file://autoheader-nonfatal-warnings.patch;patch=1 \ + file://config-site.patch;patch=1 \ ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 51ea046316b377551dfbbc7b95864f9dc21620e9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 10 Jul 2007 15:16:24 +0000 Subject: automake: added 1.10 - not tested too much, needed by parted 1.8.7, not default --- packages/automake/automake-native_1.10.bb | 3 +++ packages/automake/automake_1.10.bb | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 packages/automake/automake-native_1.10.bb create mode 100644 packages/automake/automake_1.10.bb (limited to 'packages') diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb new file mode 100644 index 0000000000..92c861f49c --- /dev/null +++ b/packages/automake/automake-native_1.10.bb @@ -0,0 +1,3 @@ +PV := "${PV}" + +require automake-native.inc diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.bb new file mode 100644 index 0000000000..eef69f4e4a --- /dev/null +++ b/packages/automake/automake_1.10.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "A tool for automatically generating Makefiles." +LICENSE = "GPL" +HOMEPAGE = "http://www.gnu.org/software/automake/" +SECTION = "devel" + +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" + +S = "${WORKDIR}/automake-${PV}" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" + +inherit autotools + +export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}" +FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" + +require automake.inc + +do_install () { + oe_runmake 'DESTDIR=${D}' install + install -d ${D}${datadir} + if [ ! -e ${D}${datadir}/aclocal ]; then + ln -sf aclocal-1.9 ${D}${datadir}/aclocal + fi + if [ ! -e ${D}${datadir}/automake ]; then + ln -sf automake-1.9 ${D}${datadir}/automake + fi +} + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 4c0c07d55cf2790fe9967c23719abb7aa15ed143 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 10 Jul 2007 15:39:24 +0000 Subject: fic-gta0[0|1].conf: move recommendation of alsa-state(s) from task-openmoko to machine configuration --- packages/tasks/task-openmoko.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 07dea3752c..8ef66b6080 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r47" +PR = "r49" ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" @@ -169,7 +169,6 @@ RDEPENDS_task-openmoko-examples = "\ # DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools" RDEPENDS_task-openmoko-debug = "\ - alsa-state \ alsa-utils-amixer \ alsa-utils-aplay \ alsa-utils-aconnect \ -- cgit v1.2.3 From b637757122ebc8d238076b894c05a5d0bb2bd416 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 10 Jul 2007 15:57:50 +0000 Subject: fic-gta0[1|2].conf: task-base handle alsa-states, no need to duplicate it here --- packages/tasks/task-base.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index c7dbf15388..368e9374d2 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r39" +PR = "r40" DEPENDS = "task-boot" PROVIDES = "${PACKAGES}" @@ -190,10 +190,11 @@ RDEPENDS_task-base-alsa = "\ alsa-utils-alsamixer" # -# alsa-state is machine related so can be missing in feed, OSS support is optional +# alsa-states are machine related so can be missing in feed, OSS support is optional # RRECOMMENDS_task-base-alsa = "\ alsa-state \ + alsa-states \ kernel-module-snd-mixer-oss \ kernel-module-snd-pcm-oss" -- cgit v1.2.3 From 001fbbcb59692a09577f5eee3d6f2fbabe5a6230 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 10 Jul 2007 17:08:25 +0000 Subject: parted 1.8.7: Make buildable with latest linux-headers. * Add an adhoc syscall macros include, and they are gone. * Also add a hacky patch to make sure that libparted build properly with autoconf 2.59, but it really requires 2.61. --- packages/parted/files/.mtn2git_empty | 0 packages/parted/files/cross-gross-hack.patch | 33 ++++++ packages/parted/files/syscalls.h | 166 +++++++++++++++++++++++++++ packages/parted/files/syscalls.patch | 10 ++ packages/parted/parted_1.8.7.bb | 19 +-- 5 files changed, 220 insertions(+), 8 deletions(-) create mode 100644 packages/parted/files/.mtn2git_empty create mode 100644 packages/parted/files/cross-gross-hack.patch create mode 100644 packages/parted/files/syscalls.h create mode 100644 packages/parted/files/syscalls.patch (limited to 'packages') diff --git a/packages/parted/files/.mtn2git_empty b/packages/parted/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/parted/files/cross-gross-hack.patch b/packages/parted/files/cross-gross-hack.patch new file mode 100644 index 0000000000..8d2db63661 --- /dev/null +++ b/packages/parted/files/cross-gross-hack.patch @@ -0,0 +1,33 @@ +diff -ur parted-1.8.7.org/configure parted-1.8.7/configure +--- parted-1.8.7.org/configure 2007-05-10 00:01:27.000000000 +0300 ++++ parted-1.8.7/configure 2007-07-10 15:46:42.000000000 +0300 +@@ -12556,7 +12556,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- ac_cv_func_malloc_0_nonnull=no ++ ac_cv_func_malloc_0_nonnull=yes + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +diff -ur parted-1.8.7.org/configure parted-1.8.7/configure +--- parted-1.8.7.org/configure 2007-07-10 15:48:07.000000000 +0300 ++++ parted-1.8.7/configure 2007-07-10 15:57:26.000000000 +0300 +@@ -12889,7 +12889,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- ac_cv_func_memcmp_working=no ++ ac_cv_func_memcmp_working=yes + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -13574,7 +13574,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- ac_cv_func_realloc_0_nonnull=no ++ ac_cv_func_realloc_0_nonnull=yes + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/packages/parted/files/syscalls.h b/packages/parted/files/syscalls.h new file mode 100644 index 0000000000..9278704b29 --- /dev/null +++ b/packages/parted/files/syscalls.h @@ -0,0 +1,166 @@ +/* + * linux/include/asm-arm/unistd.h + * + * Copyright (C) 2001-2005 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Please forward _all_ changes to this file to rmk@arm.linux.org.uk, + * no matter what the change is. Thanks! + */ +#ifndef __ASM_ARM_UNISTD_H2 +#define __ASM_ARM_UNISTD_H2 + + +#define __sys2(x) #x +#define __sys1(x) __sys2(x) + +#ifndef __syscall +#if defined(__thumb__) || defined(__ARM_EABI__) +#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name; +#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs +#define __syscall(name) "swi\t0" +#else +#define __SYS_REG(name) +#define __SYS_REG_LIST(regs...) regs +#define __syscall(name) "swi\t" __sys1(__NR_##name) "" +#endif +#endif + +#define __syscall_return(type, res) \ +do { \ + if ((unsigned long)(res) >= (unsigned long)(-129)) { \ + errno = -(res); \ + res = -1; \ + } \ + return (type) (res); \ +} while (0) + +#define _syscall0(type,name) \ +type name(void) { \ + __SYS_REG(name) \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST() ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + +#define _syscall1(type,name,type1,arg1) \ +type name(type1 arg1) { \ + __SYS_REG(name) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0) ) ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + +#define _syscall2(type,name,type1,arg1,type2,arg2) \ +type name(type1 arg1,type2 arg2) { \ + __SYS_REG(name) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + + +#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ +type name(type1 arg1,type2 arg2,type3 arg3) { \ + __SYS_REG(name) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + + +#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\ +type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ + __SYS_REG(name) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __r3 __asm__("r3") = (long)arg4; \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + + +#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ +type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \ + __SYS_REG(name) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __r3 __asm__("r3") = (long)arg4; \ + register long __r4 __asm__("r4") = (long)arg5; \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ + "r" (__r3), "r" (__r4) ) ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + +#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \ +type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) { \ + __SYS_REG(name) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __r3 __asm__("r3") = (long)arg4; \ + register long __r4 __asm__("r4") = (long)arg5; \ + register long __r5 __asm__("r5") = (long)arg6; \ + register long __res_r0 __asm__("r0"); \ + long __res; \ + __asm__ __volatile__ ( \ + __syscall(name) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ + "r" (__r3), "r" (__r4), "r" (__r5) ) ); \ + __res = __res_r0; \ + __syscall_return(type,__res); \ +} + +/* + * "Conditional" syscalls + * + * What we want is __attribute__((weak,alias("sys_ni_syscall"))), + * but it doesn't work on all toolchains, so we just do it by hand + */ +#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") + +#endif /* __ASM_ARM_UNISTD_H2 */ diff --git a/packages/parted/files/syscalls.patch b/packages/parted/files/syscalls.patch new file mode 100644 index 0000000000..be9b91cb9c --- /dev/null +++ b/packages/parted/files/syscalls.patch @@ -0,0 +1,10 @@ +--- parted-1.8.7/libparted/arch/linux.c.org 2007-05-09 23:40:13.000000000 +0300 ++++ parted-1.8.7/libparted/arch/linux.c 2007-07-10 18:20:27.000000000 +0300 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include "syscalls.h" + #include + #include + #include diff --git a/packages/parted/parted_1.8.7.bb b/packages/parted/parted_1.8.7.bb index dcb3ad7cb4..59e3aeaece 100644 --- a/packages/parted/parted_1.8.7.bb +++ b/packages/parted/parted_1.8.7.bb @@ -3,25 +3,28 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv2" SECTION = "console/tools" DEPENDS = "readline e2fsprogs-libs" -PR = "r1" +PR = "r2" -SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ + file://syscalls.h \ + file://syscalls.patch;patch=1 \ + file://cross-gross-hack.patch;patch=1" EXTRA_OECONF = "--disable-Werror" inherit autotools pkgconfig +do_configure_prepend() { + cp ${WORKDIR}/syscalls.h ${S}/libparted/arch/ +} + do_configure() { - libtoolize --force gnu-configize + libtoolize --force + autoconf oe_runconf } do_stage() { autotools_stage_all } - -# Requires autoconf 2.61. Without it, will build, but there -# will be link errors when some other package will link against -# libparted. -DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 331310cc0e2fb649c270bedc71ade2ec48eeee19 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 10 Jul 2007 17:17:29 +0000 Subject: gparted 0.3.3: Add GParted. * Tested to start/show partitions on a real device. * Somewhat usable even on QVGA. --- packages/gparted/.mtn2git_empty | 0 packages/gparted/files/.mtn2git_empty | 0 packages/gparted/files/cross.patch | 12 ++++ packages/gparted/files/gparted-0.3.3-llabs.patch | 72 ++++++++++++++++++++++++ packages/gparted/gparted_0.3.3.bb | 10 ++++ 5 files changed, 94 insertions(+) create mode 100644 packages/gparted/.mtn2git_empty create mode 100644 packages/gparted/files/.mtn2git_empty create mode 100644 packages/gparted/files/cross.patch create mode 100644 packages/gparted/files/gparted-0.3.3-llabs.patch create mode 100644 packages/gparted/gparted_0.3.3.bb (limited to 'packages') diff --git a/packages/gparted/.mtn2git_empty b/packages/gparted/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gparted/files/.mtn2git_empty b/packages/gparted/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gparted/files/cross.patch b/packages/gparted/files/cross.patch new file mode 100644 index 0000000000..08d4a29e5a --- /dev/null +++ b/packages/gparted/files/cross.patch @@ -0,0 +1,12 @@ +diff -ur gparted-0.3.3.org/configure.in gparted-0.3.3/configure.in +--- gparted-0.3.3.org/configure.in 2006-12-06 15:23:35.000000000 +0200 ++++ gparted-0.3.3/configure.in 2007-07-10 02:10:59.000000000 +0300 +@@ -37,7 +37,7 @@ + AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION) + LIBS_save="$LIBS" + LIBS="-lparted -luuid -ldl" +-AC_TRY_RUN( ++AC_TRY_LINK( + #include + #include + diff --git a/packages/gparted/files/gparted-0.3.3-llabs.patch b/packages/gparted/files/gparted-0.3.3-llabs.patch new file mode 100644 index 0000000000..07c4020e57 --- /dev/null +++ b/packages/gparted/files/gparted-0.3.3-llabs.patch @@ -0,0 +1,72 @@ +--- src/GParted_Core.cc 2006/09/25 21:49:32 1.1 ++++ src/GParted_Core.cc 2006/09/25 22:03:31 +@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons + + while ( succes && + timer .elapsed() <= smallest_time && +- std::llabs( done ) + N <= length && ++ llabs( done ) + N <= length && + optimal_blocksize * 2 < N ) + { + if ( done != 0 ) +@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons + dst_device, + src_start + ( dst_start > src_start ? 0 : done ), + dst_start + ( dst_start > src_start ? 0 : done ), +- length - std::llabs( done ), ++ length - llabs( done ), + optimal_blocksize, + operationdetail, + readonly, +@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl + if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) ) + { + Glib::ustring error_message ; +- buf = static_cast( malloc( std::llabs( blocksize ) * 512 ) ) ; ++ buf = static_cast( malloc( llabs( blocksize ) * 512 ) ) ; + if ( buf ) + { + ped_device_sync( lp_device_dst ) ; +@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl + operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ; + + Glib::Timer timer_progress_timeout, timer_total ; +- while( succes && std::llabs( done ) < length ) ++ while( succes && llabs( done ) < length ) + { + succes = copy_block( lp_device_src, + lp_device_dst, +@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl + if ( timer_progress_timeout .elapsed() >= 0.5 ) + { + set_progress_info( length, +- std::llabs( done + blocksize ), ++ llabs( done + blocksize ), + timer_total, + operationdetail .get_last_child() .get_last_child(), + readonly ) ; +@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl + + //final description + operationdetail .get_last_child() .get_last_child() .set_description( +- String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ; ++ String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ; + + if ( ! succes && ! error_message .empty() ) + operationdetail .get_last_child() .add_child( + OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ; + +- total_done += std::llabs( done ) ; ++ total_done += llabs( done ) ; + + //close and destroy the devices.. + ped_device_close( lp_device_src ) ; +@@ -1912,7 +1912,7 @@ bool GParted_Core::copy_block( PedDevice + + if ( blocksize < 0 ) + { +- blocksize = std::llabs( blocksize ) ; ++ blocksize = llabs( blocksize ) ; + offset_src -= ( blocksize -1 ) ; + offset_dst -= ( blocksize -1 ) ; + } diff --git a/packages/gparted/gparted_0.3.3.bb b/packages/gparted/gparted_0.3.3.bb new file mode 100644 index 0000000000..43623d7348 --- /dev/null +++ b/packages/gparted/gparted_0.3.3.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "GNOME Partition Manager" +LICENSE = "GPL" +DEPENDS = "gtkmm parted" +PR = "r1" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \ + file://cross.patch;patch=1 \ + file://gparted-0.3.3-llabs.patch;patch=1;pnum=0" -- cgit v1.2.3 From ac1fec6bdda1c7a27852a872ba6e4341ff674ace Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 10 Jul 2007 19:16:11 +0000 Subject: linux-handhelds-2.6: Add 2.6.21-hh11. * Changes since -hh10 are: 1. looxc550 port added (initial stage). 2. acx: PCMCIA driver written. 3. h4000, htcblueangel: PCMCIA support revamped, ACX100 WiFi works now. 4. hamcop_base, samcop_base: Initial support for child devices paradigm. 5. Codebase cleanup and restructuring. --- packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3 From 202365bc8a7a478deccaa7d8264053ed4f531c08 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 10 Jul 2007 19:42:59 +0000 Subject: m4-native_1.4.8.bb : added version 1.4.8 which is needed by some packages using autoconf 2.61. DEFAULT_PREF = "-1" until we decide to switch to autoconf 2.61 --- packages/m4/m4-native_1.4.8.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/m4/m4-native_1.4.8.bb (limited to 'packages') diff --git a/packages/m4/m4-native_1.4.8.bb b/packages/m4/m4-native_1.4.8.bb new file mode 100644 index 0000000000..7febc214df --- /dev/null +++ b/packages/m4/m4-native_1.4.8.bb @@ -0,0 +1,21 @@ +require m4_${PV}.bb + +inherit native + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4" + +INHIBIT_AUTOTOOLS_DEPS = "1" +DEPENDS += "gnu-config-native" + +DEFAULT_PREFERENCE = "-1" + +do_configure() { + install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub . + install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess . + oe_runconf +} + +do_stage() { + install -m 0755 src/m4 ${STAGING_BINDIR}/ +} + -- cgit v1.2.3 From 0aad8b50511c04a4dfda2b43d4e450c3b4b9a9fb Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 10 Jul 2007 23:18:21 +0000 Subject: evince_0.9.2.bb : version bump --- packages/evince/evince_0.9.2.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/evince/evince_0.9.2.bb (limited to 'packages') diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb new file mode 100644 index 0000000000..64e2e41275 --- /dev/null +++ b/packages/evince/evince_0.9.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." +LICENSE = "GPL" +SECTION = "x11/office" +DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +RDEPENDS = "espgs " +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" + +inherit gnome pkgconfig gtk-icon-cache + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \ + file://no-icon-theme.diff;patch=1;pnum=0 \ + file://no-help-dir.patch;patch=1" + +EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper" + -- cgit v1.2.3