[oe-commits] org.oe.dev merge of '0a5045efa2609655b6717431c477b9d997fa9dd1'

rpurdie commit openembedded-commits at lists.openembedded.org
Sun Sep 2 19:46:03 UTC 2007 

merge of '0a5045efa2609655b6717431c477b9d997fa9dd1'
     and '8548c765d7840651dc3e1d81df59a848a8b61fb6'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1b7186aa86bc70a6c90f4df3caeac3fd2acd8fb6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1b7186aa86bc70a6c90f4df3caeac3fd2acd8fb6
Files:
1
site/arm-common
site/arm-linux
site/common
site/common-glibc
site/ix86-common
packages/angstrom/angstrom-feed-configs.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
Diffs:

#
# mt diff -r0a5045efa2609655b6717431c477b9d997fa9dd1 -r1b7186aa86bc70a6c90f4df3caeac3fd2acd8fb6
#
# 
# 
# patch "site/arm-common"
#  from [3017a54773863933720edf32a807d5635f31c4c5]
#    to [ecf2a534f02c13112966894c667404400acb1322]
# 
# patch "site/arm-linux"
#  from [017788fd0a47a59e3f7e27ad7bb78eb2a549c570]
#    to [54d1119edd33744f9c0828b9efeaf7afd7f282b6]
# 
# patch "site/common"
#  from [4c5717589511ac949a398eafd210fdd7e1acbe0a]
#    to [cdf94deb262bc3c01c24a16c1228e5b016e9fb04]
# 
# patch "site/common-glibc"
#  from [04aac29fbcd57e76f54f3d213fadf54ac9ed1506]
#    to [dcdbc1de2506454c1ddcb1b471c5c26218ca28fc]
# 
# patch "site/ix86-common"
#  from [c94dc5adc2a936c8f531a54be0ce51d0b6b1a68d]
#    to [d8fa481822d52ac3e2192ceabc012ca07c564206]
# 
============================================================
--- site/arm-common	3017a54773863933720edf32a807d5635f31c4c5
+++ site/arm-common	ecf2a534f02c13112966894c667404400acb1322
@@ -103,11 +103,6 @@ glib_cv_sys_use_pid_niceness_surrogate=$
 glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4}
 glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
 glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes}
-glib_cv_strlcpy=${glib_cv_strlcpy=no}
-ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
-ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes}
-ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
-glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
 
 #gstreamer
 as_cv_unaligned_access=${as_cv_unaligned_access=no}
@@ -234,3 +229,9 @@ jm_cv_func_working_readdir=yes
 # xffm
 jm_cv_func_working_readdir=yes
 
+# dpkg
+dpkg_cv_va_copy=${ac_cv_va_copy=yes}
+dpkg_cv___va_copy=${ac_cv___va_copy=yes}
+
+# eds-dbus
+ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
============================================================
--- site/arm-linux	017788fd0a47a59e3f7e27ad7bb78eb2a549c570
+++ site/arm-linux	54d1119edd33744f9c0828b9efeaf7afd7f282b6
@@ -150,10 +150,6 @@ samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LI
 samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
 samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
 
-# dpkg
-dpkg_cv_va_copy=${ac_cv_va_copy=yes}
-dpkg_cv___va_copy=${ac_cv___va_copy=yes}
-
 # enca
 yeti_cv_func_scanf_modif_size_t=yes
 
@@ -163,8 +159,8 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_fun
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
-# dbus
-ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no}
+#dbus
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
 
 # lftp
 ac_cv_file___dev_ptc_=yes
============================================================
--- site/common	4c5717589511ac949a398eafd210fdd7e1acbe0a
+++ site/common	cdf94deb262bc3c01c24a16c1228e5b016e9fb04
@@ -1,4 +1,5 @@ mr_cv_target_elf=${mr_cv_target_elf=yes}
 # libelf
 mr_cv_target_elf=${mr_cv_target_elf=yes}
 
+# Normally kernels have /dev/random enabled
 ac_cv_file__dev_random=${ac_cv_file__dev_random=yes}
============================================================
--- site/common-glibc	04aac29fbcd57e76f54f3d213fadf54ac9ed1506
+++ site/common-glibc	dcdbc1de2506454c1ddcb1b471c5c26218ca28fc
@@ -13,5 +13,13 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_fun
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
+# glib
+glib_cv_strlcpy=${glib_cv_strlcpy=no}
+ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
+ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes}
+ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
+glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
+glib_cv_long_long_format=${glib_cv_long_long_format=ll}
+
 # gnucash
 am_cv_scanf_lld=${am_cv_scanf_lld=yes}
============================================================
--- site/ix86-common	c94dc5adc2a936c8f531a54be0ce51d0b6b1a68d
+++ site/ix86-common	d8fa481822d52ac3e2192ceabc012ca07c564206
@@ -256,3 +256,9 @@ ac_cv_file__usr_share_X11_sgml_defs_ent=
 # xorg X11R7
 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no}
 ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no}
+
+# eds-dbus
+ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
+
+#dbus
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}


#
# mt diff -r8548c765d7840651dc3e1d81df59a848a8b61fb6 -r1b7186aa86bc70a6c90f4df3caeac3fd2acd8fb6
#
# 
# 
# add_file "packages/angstrom/angstrom-feed-configs.bb"
#  content [0ea9d88230134ade107de738ba3400d561a97222]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [854daa8fca5bd432a53da00b9cfe542bb9051a48]
#    to [74d52894de81c753876efd67a5bdc1df826e5c1c]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [b77bf1ae8065f62d290b081224c4460ffb79335e]
#    to [314e54232030fd4279f9794dc77445d68a4fa3ba]
# 
============================================================
--- packages/angstrom/angstrom-feed-configs.bb	0ea9d88230134ade107de738ba3400d561a97222
+++ packages/angstrom/angstrom-feed-configs.bb	0ea9d88230134ade107de738ba3400d561a97222
@@ -0,0 +1,23 @@
+DESCRIPTION = "Configuration files for online package repositories aka feeds"
+
+PR = "0"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FEED_BASEPATH ?= "unstable/feed/"
+
+do_compile() {
+        mkdir -p ${S}/${sysconfdir}/ipkg
+	for feed in base debug perl python gstreamer ; do
+          echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/ipkg/${feed}-feed.conf
+	done
+
+        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf
+	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf
+}
+
+
+do_install () {
+        install -d ${D}${sysconfdir}/ipkg
+	install -m 0644  ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/
+}
+
============================================================
--- conf/distro/angstrom-2007.1.conf	854daa8fca5bd432a53da00b9cfe542bb9051a48
+++ conf/distro/angstrom-2007.1.conf	74d52894de81c753876efd67a5bdc1df826e5c1c
@@ -6,8 +6,8 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2007.4"
-DISTRO_VERSION = "test-${DATE}"
+#DISTRO_VERSION = "2007.9"
+DISTRO_VERSION = "2007.9-test-${DATE}"
 DISTRO_REVISION = "46"
 
 require conf/distro/include/sane-srcdates.inc
============================================================
--- conf/distro/include/angstrom.inc	b77bf1ae8065f62d290b081224c4460ffb79335e
+++ conf/distro/include/angstrom.inc	314e54232030fd4279f9794dc77445d68a4fa3ba
@@ -14,7 +14,7 @@ require conf/distro/include/angstrom-${A
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
 #Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org"
+ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-distro-devel at linuxtogo.org>"

More information about the Openembedded-commits mailing list