[oe-commits] org.oe.dev merge of '330fb172df78da5ccf19876c4fa2be87783aea08'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:50:52 UTC 2007
merge of '330fb172df78da5ccf19876c4fa2be87783aea08'
and '340ff84700df308d945fb6efde89fbb319ff1a84'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2
Files:
1
packages/parted/files
packages/parted/files/cross-gross-hack.patch
packages/parted/files/syscalls.h
packages/parted/files/syscalls.patch
packages/parted/parted_1.8.7.bb
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r330fb172df78da5ccf19876c4fa2be87783aea08 -r9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2
#
#
#
# add_dir "packages/parted/files"
#
# add_file "packages/parted/files/cross-gross-hack.patch"
# content [4442d2403c1b2ad039f7f337220985ca4e31dfb3]
#
# add_file "packages/parted/files/syscalls.h"
# content [9ff44c11dc2d4a6ce3154f105c87965271e7da07]
#
# add_file "packages/parted/files/syscalls.patch"
# content [f02b0412dedb9f31aa19360d79847f6b176d75c4]
#
# patch "packages/parted/parted_1.8.7.bb"
# from [35f9b305760bd77fe10ab9d0cbac3681d29a911f]
# to [d6afd38558136f4935253ac51b004acc3fd7bbdd]
#
============================================================
--- packages/parted/files/cross-gross-hack.patch 4442d2403c1b2ad039f7f337220985ca4e31dfb3
+++ packages/parted/files/cross-gross-hack.patch 4442d2403c1b2ad039f7f337220985ca4e31dfb3
@@ -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. */
============================================================
--- packages/parted/files/syscalls.h 9ff44c11dc2d4a6ce3154f105c87965271e7da07
+++ packages/parted/files/syscalls.h 9ff44c11dc2d4a6ce3154f105c87965271e7da07
@@ -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 at 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 */
============================================================
--- packages/parted/files/syscalls.patch f02b0412dedb9f31aa19360d79847f6b176d75c4
+++ packages/parted/files/syscalls.patch f02b0412dedb9f31aa19360d79847f6b176d75c4
@@ -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 <stdio.h>
+ #include <syscall.h>
+ #include <unistd.h>
++#include "syscalls.h"
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
============================================================
--- packages/parted/parted_1.8.7.bb 35f9b305760bd77fe10ab9d0cbac3681d29a911f
+++ packages/parted/parted_1.8.7.bb d6afd38558136f4935253ac51b004acc3fd7bbdd
@@ -1,27 +1,30 @@ DEPENDS = "readline e2fsprogs-libs"
DESCRIPTION = "parted, the GNU partition resizing program"
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"
#
# mt diff -r340ff84700df308d945fb6efde89fbb319ff1a84 -r9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2
#
#
#
# patch "conf/machine/fic-gta01.conf"
# from [23aa3fc9534120dd38935869df0535f58909579d]
# to [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
#
# patch "conf/machine/fic-gta02.conf"
# from [dbb06e41897ef8d2e5a888b86e3e8157bb667557]
# to [35a3ed508f3117b908249db21b5778bc4578be37]
#
# patch "packages/tasks/task-base.bb"
# from [8063e1b226de759fef34b1a23b3845f05b89bb7c]
# to [2b89141c35420f2a2ec89ff47305e1e4034c4067]
#
============================================================
--- conf/machine/fic-gta01.conf 23aa3fc9534120dd38935869df0535f58909579d
+++ conf/machine/fic-gta01.conf 1c8e90287feedbc8f33cb1859b4e13cbf1007c10
@@ -11,8 +11,6 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
# package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-bt \
@@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-snd-soc-smdk2440 \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437 \
- \
- alsa-state \
- alsa-states \
"
# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
============================================================
--- conf/machine/fic-gta02.conf dbb06e41897ef8d2e5a888b86e3e8157bb667557
+++ conf/machine/fic-gta02.conf 35a3ed508f3117b908249db21b5778bc4578be37
@@ -11,8 +11,6 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
# package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-bt \
@@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-snd-soc-smdk2440 \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437 \
- \
- alsa-state \
- alsa-states \
"
SERIAL_CONSOLE = "115200 ttySAC2"
============================================================
--- packages/tasks/task-base.bb 8063e1b226de759fef34b1a23b3845f05b89bb7c
+++ packages/tasks/task-base.bb 2b89141c35420f2a2ec89ff47305e1e4034c4067
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
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"
More information about the Openembedded-commits
mailing list