[oe-commits] org.oe.dev merge of 'a79e5ae3153847b525489dc6fd0b472b58bd3b17'
cbrake commit
openembedded-commits at lists.openembedded.org
Mon Sep 3 21:04:04 UTC 2007
merge of 'a79e5ae3153847b525489dc6fd0b472b58bd3b17'
and 'fc1241826299a6a458edf92c52b4d95c0b785dfa'
Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: ee3ac71c2bf15ddb9729b664e1677265b531962c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ee3ac71c2bf15ddb9729b664e1677265b531962c
Files:
1
packages/samba/samba.inc
packages/samba/samba_3.0.23c.bb
packages/mono/mono-1.2.4+1.2.5pre5
packages/mono/mono-1.2.4+1.2.5pre5/configure.patch
packages/mono/mono-native_1.2.5pre5.bb
packages/mono/mono_1.2.5pre5.bb
packages/mono/mono_1.2.5pre5.inc
packages/mono/mono-1.2.5
packages/mono/mono-1.2.5/configure.patch
packages/mono/mono-native_1.2.5.bb
packages/mono/mono_1.2.5.bb
packages/mono/mono_1.2.5.inc
packages/images/angstrom-minimal-image-with-mtd-utils.bb
Diffs:
#
# mt diff -ra79e5ae3153847b525489dc6fd0b472b58bd3b17 -ree3ac71c2bf15ddb9729b664e1677265b531962c
#
#
#
# patch "packages/samba/samba.inc"
# from [ce3be8319f8a58fc27ea8888ae3cc05bb5a39391]
# to [7d4adb1461ffec0246a42e66fb6a18b8ca48912d]
#
# patch "packages/samba/samba_3.0.23c.bb"
# from [845a45894e30a0fa967fb1fcf3001c2382d9bd7a]
# to [be528ec63ea7db2e3846a6b3b89327e1d3fb653d]
#
============================================================
--- packages/samba/samba.inc ce3be8319f8a58fc27ea8888ae3cc05bb5a39391
+++ packages/samba/samba.inc 7d4adb1461ffec0246a42e66fb6a18b8ca48912d
@@ -1,6 +1,6 @@ LICENSE = "GPL"
SECTION = "console/network"
LICENSE = "GPL"
-DEPENDS = "readline"
+DEPENDS = "readline virtual/libiconv"
SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
file://configure.patch;patch=1 \
@@ -10,6 +10,7 @@ EXTRA_OECONF='--disable-cups --with-read
inherit autotools
EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+ --with-libiconv=${STAGING_LIBDIR}/.. \
--without-ads --without-automount --with-smbmount'
PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
============================================================
--- packages/samba/samba_3.0.23c.bb 845a45894e30a0fa967fb1fcf3001c2382d9bd7a
+++ packages/samba/samba_3.0.23c.bb be528ec63ea7db2e3846a6b3b89327e1d3fb653d
@@ -1,6 +1,8 @@ inherit update-rc.d
require samba.inc
inherit update-rc.d
+PR = "r1"
+
SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
#
# mt diff -rfc1241826299a6a458edf92c52b4d95c0b785dfa -ree3ac71c2bf15ddb9729b664e1677265b531962c
#
#
#
# delete "packages/mono/mono-1.2.4+1.2.5pre5"
#
# delete "packages/mono/mono-1.2.4+1.2.5pre5/configure.patch"
#
# delete "packages/mono/mono-native_1.2.5pre5.bb"
#
# delete "packages/mono/mono_1.2.5pre5.bb"
#
# delete "packages/mono/mono_1.2.5pre5.inc"
#
# add_dir "packages/mono/mono-1.2.5"
#
# add_file "packages/mono/mono-1.2.5/configure.patch"
# content [5703d8129a1e4c9abe1aa099e976de04075d053c]
#
# add_file "packages/mono/mono-native_1.2.5.bb"
# content [ce14d0418725367d8186b1a257526c4e85d9e3e4]
#
# add_file "packages/mono/mono_1.2.5.bb"
# content [662aece9a44429e4257ddd7f7c659729fe8e0a5e]
#
# add_file "packages/mono/mono_1.2.5.inc"
# content [2608b1bb07bca18c244387179e3d67c713c4bce9]
#
# patch "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
# from [5788c842aec73348a25d838114582c5b6e44c17e]
# to [723d1b6c688e08393bf534cca33166bd1a05b210]
#
============================================================
--- packages/mono/mono-1.2.5/configure.patch 5703d8129a1e4c9abe1aa099e976de04075d053c
+++ packages/mono/mono-1.2.5/configure.patch 5703d8129a1e4c9abe1aa099e976de04075d053c
@@ -0,0 +1,67 @@
+Index: mono-1.2.5/configure.in
+===================================================================
+--- mono-1.2.5.orig/configure.in
++++ mono-1.2.5/configure.in
+@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then
+ ], [
+ AC_MSG_RESULT(no)
+ with_tls=pthread
++ ], [
++ AC_MSG_RESULT(yes)
+ ])
+ fi
+
+@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then
+ ], [
+ with_sigaltstack=no
+ AC_MSG_RESULT(no)
++ ], [
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ ])
+ fi
+
+@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then
+ ])
+ fi
+
+-if test ${TARGET} = ARM; then
+- dnl ******************************************
+- dnl *** Check to see what FPU is available ***
+- dnl ******************************************
+- AC_MSG_CHECKING(which FPU to use)
+-
+- AC_TRY_COMPILE([], [
+- __asm__ ("ldfd f0, [r0]");
+- ], fpu=FPA, [
+- AC_TRY_COMPILE([], [
+- __asm__ ("fldd d0, [r0]");
+- ], fpu=VFP, fpu=NONE)
+- ])
++#if test ${TARGET} = ARM; then
++# dnl ******************************************
++# dnl *** Check to see what FPU is available ***
++# dnl ******************************************
++# AC_MSG_CHECKING(which FPU to use)
++#
++# AC_TRY_COMPILE([], [
++# __asm__ ("ldfd f0, [r0]");
++# ], fpu=FPA, [
++# AC_TRY_COMPILE([], [
++# __asm__ ("fldd d0, [r0]");
++# ], fpu=VFP, fpu=NONE)
++# ])
++#
++# AC_MSG_RESULT($fpu)
++# CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
++# unset fpu
++#fi
+
+- AC_MSG_RESULT($fpu)
+- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
+- unset fpu
+-fi
++ CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
+
+ if test ${TARGET} = unknown; then
+ CPPFLAGS="$CPPFLAGS -DNO_PORT"
============================================================
--- packages/mono/mono-native_1.2.5.bb ce14d0418725367d8186b1a257526c4e85d9e3e4
+++ packages/mono/mono-native_1.2.5.bb ce14d0418725367d8186b1a257526c4e85d9e3e4
@@ -0,0 +1,10 @@
+require mono_1.2.5.inc
+PR = "r2"
+DEPENDS = "glib-2.0-native"
+
+inherit native
+
+#do_stage_prepend() {
+# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+#}
+
============================================================
--- packages/mono/mono_1.2.5.bb 662aece9a44429e4257ddd7f7c659729fe8e0a5e
+++ packages/mono/mono_1.2.5.bb 662aece9a44429e4257ddd7f7c659729fe8e0a5e
@@ -0,0 +1,23 @@
+require mono_1.2.5.inc
+
+#DEPENDS = "mono-native glib-2.0"
+# for now, we skip the mono-native build -- just install
+# mono using your distro package manager for now
+# after we get the target version working, we'll worry
+# about the native package for systems that don't have mono
+# installed
+DEPENDS = "glib-2.0"
+
+PR = "r0"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+do_install_append() {
+ install -d ${D}${libdir}/mono/1.0/
+ cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
+}
+
+PACKAGES =+ "mono-dll"
+FILES_mono-dll = "${libdir}/mono/1.0/"
+
+
============================================================
--- packages/mono/mono_1.2.5.inc 2608b1bb07bca18c244387179e3d67c713c4bce9
+++ packages/mono/mono_1.2.5.inc 2608b1bb07bca18c244387179e3d67c713c4bce9
@@ -0,0 +1,16 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+# the md5 sum check is required because Novell does not version their pre release versions of mono
+# if the md5sum check fails, contact cbrake on #oe
+# checksums are stored in conf/checksums.ini
+SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2"
+
+S = "${WORKDIR}/mono-1.2.5"
+
+inherit autotools
+EXTRA_OECONF = "--disable-mcs-build"
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
============================================================
--- packages/images/angstrom-minimal-image-with-mtd-utils.bb 5788c842aec73348a25d838114582c5b6e44c17e
+++ packages/images/angstrom-minimal-image-with-mtd-utils.bb 723d1b6c688e08393bf534cca33166bd1a05b210
@@ -5,3 +5,5 @@ RDEPENDS += "mtd-utils"
require angstrom-minimal-image.bb
RDEPENDS += "mtd-utils"
+export IMAGE_BASENAME = "minimalist-image-mtdutils"
+
More information about the Openembedded-commits
mailing list