[oe-commits] org.oe.dev merge of '2576615cdf291581844012f4b21f38bc8f07b3e5'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Jan 28 14:19:01 UTC 2008
merge of '2576615cdf291581844012f4b21f38bc8f07b3e5'
and 'e5a4ea76d9c872b195ecd4a8b3cf6e2c49849d72'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: dddb30d5049fad23f452f7c5364372053ad80330
ViewMTN: http://monotone.openembedded.org/revision/info/dddb30d5049fad23f452f7c5364372053ad80330
Files:
1
conf/machine/include/tune-strongarm1100.inc
conf/machine/include/tune-strongarm.inc
conf/machine/collie.conf
conf/machine/h3600.conf
conf/machine/htcwallaby.conf
conf/machine/jornada56x.conf
conf/machine/jornada7xx.conf
conf/machine/shark.conf
conf/machine/simpad.conf
packages/mysql/mysql_4.1.18.bb
packages/dbus/dbus-1.1.1
packages/dbus/dbus-1.1.4
packages/dbus/dbus_1.1.1.bb
packages/dbus/dbus_1.1.4.bb
Diffs:
#
# mt diff -r2576615cdf291581844012f4b21f38bc8f07b3e5 -rdddb30d5049fad23f452f7c5364372053ad80330
#
#
#
# rename "conf/machine/include/tune-strongarm1100.inc"
# to "conf/machine/include/tune-strongarm.inc"
#
# patch "conf/machine/collie.conf"
# from [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
# to [c23a85835bc13ac978f36742cfc8ccf5880e0ec8]
#
# patch "conf/machine/h3600.conf"
# from [946b47e617dd5bb30df3ee547902b05861e89f5b]
# to [baccbbb3fd46dea023ff7dc49ac173b169688428]
#
# patch "conf/machine/htcwallaby.conf"
# from [d6588b12e47e4671574a6a9f611ca56ed3e54a66]
# to [f536aa7626c709ec12492ce50cec7af6c4062a8c]
#
# patch "conf/machine/include/tune-strongarm.inc"
# from [6b646008e17bfa06b0b28e48fd811701e7f4ea78]
# to [05471dc0b54ab7a2645738ef50732cc747c8c18b]
#
# patch "conf/machine/jornada56x.conf"
# from [6e67e41a8cb53163822499066dcf76e2ed17c3eb]
# to [feef2730324948026b5302d47b01bae79fa6bc39]
#
# patch "conf/machine/jornada7xx.conf"
# from [b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac]
# to [931f12408f78e84eaafc92103fd2590493bcd246]
#
# patch "conf/machine/shark.conf"
# from [45f471879704cfba13dd30daae06942e7bdd6716]
# to [8a744b9daf9db02c05297d317225e9f6d6cb012e]
#
# patch "conf/machine/simpad.conf"
# from [b9316853a8b1c9a28a1c4df96b4166a416335cc3]
# to [9987d298771d159fd85308e85bdb5a82fd16832d]
#
# patch "packages/mysql/mysql_4.1.18.bb"
# from [ec2784c91fd5bc105a8057f5042fe33961509c8f]
# to [9ee5d3cad64104736efe2bdbe8b14badacb94163]
#
============================================================
--- conf/machine/collie.conf 7c673b43c50f37bbb2d12b14434564b0e9613ec3
+++ conf/machine/collie.conf c23a85835bc13ac978f36742cfc8ccf5880e0ec8
@@ -1,12 +1,12 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
TARGET_ARCH = "arm"
-TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
MACHINE_KERNEL_VERSION ?= "2.6"
require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/tune-strongarm.inc
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
============================================================
--- conf/machine/h3600.conf 946b47e617dd5bb30df3ee547902b05861e89f5b
+++ conf/machine/h3600.conf baccbbb3fd46dea023ff7dc49ac173b169688428
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 "
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
# h3700, h3800 have 32, but let that be the bonus
ROOT_FLASH_SIZE = "16"
============================================================
--- conf/machine/htcwallaby.conf d6588b12e47e4671574a6a9f611ca56ed3e54a66
+++ conf/machine/htcwallaby.conf f536aa7626c709ec12492ce50cec7af6c4062a8c
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 "
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
ROOT_FLASH_SIZE = "16"
VOLATILE_STORAGE_SIZE = "32"
============================================================
--- conf/machine/include/tune-strongarm1100.inc 6b646008e17bfa06b0b28e48fd811701e7f4ea78
+++ conf/machine/include/tune-strongarm.inc 05471dc0b54ab7a2645738ef50732cc747c8c18b
@@ -1,5 +1,6 @@
-# This machine lists common configuration options for Strongarm 1100 devices
-# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+# This machine lists common configuration options for Strongarm devices
+# gcc does not differentiate between the different Strongarm versions, so neither do we
+# http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
-TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
============================================================
--- conf/machine/jornada56x.conf 6e67e41a8cb53163822499066dcf76e2ed17c3eb
+++ conf/machine/jornada56x.conf feef2730324948026b5302d47b01bae79fa6bc39
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttySA0"
SERIAL_CONSOLE = "115200 ttySA0"
+require conf/machine/include/tune-strongarm.inc
-require conf/machine/include/tune-strongarm1100.inc
============================================================
--- conf/machine/jornada7xx.conf b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac
+++ conf/machine/jornada7xx.conf 931f12408f78e84eaafc92103fd2590493bcd246
@@ -1,10 +1,10 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@NAME: HP Jornada 7xx
#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
TARGET_ARCH = "arm"
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
PCMCIA_MANAGER = "pcmciautils"
============================================================
--- conf/machine/shark.conf 45f471879704cfba13dd30daae06942e7bdd6716
+++ conf/machine/shark.conf 8a744b9daf9db02c05297d317225e9f6d6cb012e
@@ -15,7 +15,7 @@ USE_VT = "0"
ROOT_FLASH_SIZE = "16"
USE_VT = "0"
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
============================================================
--- conf/machine/simpad.conf b9316853a8b1c9a28a1c4df96b4166a416335cc3
+++ conf/machine/simpad.conf 9987d298771d159fd85308e85bdb5a82fd16832d
@@ -9,7 +9,7 @@ include conf/machine/include/simpad-${MA
MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm1100.inc
+require conf/machine/include/tune-strongarm.inc
ROOT_FLASH_SIZE = "16"
============================================================
--- packages/mysql/mysql_4.1.18.bb ec2784c91fd5bc105a8057f5042fe33961509c8f
+++ packages/mysql/mysql_4.1.18.bb 9ee5d3cad64104736efe2bdbe8b14badacb94163
@@ -1,9 +1,9 @@ DESCRIPTION = "The MySQL Open Source Dat
DESCRIPTION = "The MySQL Open Source Database System"
+HOMEPAGE = "http://www.mysql.com/"
SECTION = "libs"
-HOMEPAGE = "http://www.mysql.com/"
+LICENSE = "GPL"
DEPENDS += "ncurses mysql-native"
-LICENSE = "GPL"
-PR="r2"
+PR = "r3"
SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
file://autofoo.patch;patch=1 \
@@ -63,7 +63,7 @@ pkg_postrm_mysql-server () {
grep mysql /etc/passwd && deluser mysql
}
-PACKAGES = "${PN} libmysqlclient libmysqlclient-dev mysql-client mysql-server"
+PACKAGES = "${PN}-dbg ${PN} libmysqlclient libmysqlclient-dev mysql-client mysql-server ${PN}-leftovers"
FILES_${PN} = " "
RDEPENDS_${PN} = "mysql-client mysql-server"
@@ -138,3 +138,6 @@ ${sysconfdir}/my.cnf"
${localstatedir}/mysql/ \
${sysconfdir}/init.d \
${sysconfdir}/my.cnf"
+
+DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}"
+FILES_${PN}-leftovers = "/"
#
# mt diff -re5a4ea76d9c872b195ecd4a8b3cf6e2c49849d72 -rdddb30d5049fad23f452f7c5364372053ad80330
#
#
#
# rename "packages/dbus/dbus-1.1.1"
# to "packages/dbus/dbus-1.1.4"
#
# rename "packages/dbus/dbus_1.1.1.bb"
# to "packages/dbus/dbus_1.1.4.bb"
#
# patch "packages/dbus/dbus_1.1.4.bb"
# from [bade67e59960ff917ea8dcfe8978a1f1023618c2]
# to [2620cb738271995a8ec1c4b28c0200f14fe16a34]
#
============================================================
--- packages/dbus/dbus_1.1.1.bb bade67e59960ff917ea8dcfe8978a1f1023618c2
+++ packages/dbus/dbus_1.1.4.bb 2620cb738271995a8ec1c4b28c0200f14fe16a34
@@ -1,62 +1,9 @@
-DEFAULT_PREFERENCE = "-1"
+include dbus.inc
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
+PR = "r0"
-PR = "r4"
+SRC_URI += "file://fix-install-daemon.patch;patch=1"
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
- file://tmpdir.patch;patch=1 \
- file://dbus-1.init \
- file://cross.patch;patch=1 \
- file://fix-install-daemon.patch;patch=1"
-
-inherit autotools pkgconfig update-rc.d gettext
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "defaults"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
-
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
-
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
- exit 1
-fi
-
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
-
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-}
-
-EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
- --disable-doxygen-docs --with-xml=expat --without-x"
-
-do_stage () {
- oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
- autotools_stage_includes
-
- mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
- install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
-
-do_install_append () {
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-}
-
python populate_packages_prepend () {
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
bb.data.setVar('PKG_dbus', 'dbus-1', d)
More information about the Openembedded-commits
mailing list