[oe-commits] org.oe.dev merge of '148f8dde1ce484726500604f6b511b828737ed47'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Jun 22 13:19:07 UTC 2007
merge of '148f8dde1ce484726500604f6b511b828737ed47'
and '6ac0eb72e728e774076082cbfbb28ee430dc6485'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: fcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f
Files:
1
packages/uucp/files
packages/uucp/files/policy.patch
packages/uucp/uucp_1.07.bb
packages/geoclue/geoclue_svn.bb
packages/geoclue/geoclue_git.bb
Diffs:
#
# mt diff -r148f8dde1ce484726500604f6b511b828737ed47 -rfcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f
#
#
#
# add_dir "packages/uucp/files"
#
# add_file "packages/uucp/files/policy.patch"
# content [3bad875ffc5b65ade3c928c177f9f23ae808ebe3]
#
# patch "packages/uucp/uucp_1.07.bb"
# from [6b7273c57f3a954b96cd7f41b3461416fb85e16d]
# to [07488d78a44d7740fd396c2e53b9ea02a1da45bf]
#
============================================================
--- packages/uucp/files/policy.patch 3bad875ffc5b65ade3c928c177f9f23ae808ebe3
+++ packages/uucp/files/policy.patch 3bad875ffc5b65ade3c928c177f9f23ae808ebe3
@@ -0,0 +1,85 @@
+Index: uucp-1.07/policy.h
+===================================================================
+--- uucp-1.07.orig/policy.h 2003-05-29 06:08:45.000000000 +0000
++++ uucp-1.07/policy.h 2007-03-09 00:51:55.000000000 +0000
+@@ -240,7 +240,7 @@
+ the sendmail choice below. Otherwise, select one of the other
+ choices as appropriate. */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
++#define MAIL_PROGRAM "/usr/sbin/sendmail -oi -t"
+ /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock"
+
+ /* You must also specify the format of the lock files by setting
+ exactly one of the following macros to 1. Check an existing lock
+@@ -349,7 +349,7 @@
+ The format for QNX lock files was made up just for Taylor UUCP.
+ QNX doesn't come with a version of UUCP. */
+ #define HAVE_V2_LOCKFILES 0
+-#define HAVE_HDB_LOCKFILES 0
++#define HAVE_HDB_LOCKFILES 1
+ #define HAVE_SCO_LOCKFILES 0
+ #define HAVE_SVR4_LOCKFILES 0
+ #define HAVE_SEQUENT_LOCKFILES 0
+@@ -466,8 +466,8 @@
+ When looking something up (a system, a port, etc.) the new style
+ configuration files will be read first, followed by the V2
+ configuration files, followed by the HDB configuration files. */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+
+ /* Exactly one of the following macros must be set to 1. The exact
+ format of the spool directories is explained in unix/spool.c.
+@@ -572,7 +572,7 @@
+ /* The name of the default spool directory. If HAVE_TAYLOR_CONFIG is
+ set to 1, this may be overridden by the ``spool'' command in the
+ configuration file. */
+-#define SPOOLDIR "/usr/spool/uucp"
++#define SPOOLDIR "/var/spool/uucp"
+ /* #define SPOOLDIR "/var/spool/uucp" */
+
+ /* The name of the default public directory. If HAVE_TAYLOR_CONFIG is
+@@ -580,7 +580,7 @@
+ configuration file. Also, a particular system may be given a
+ specific public directory by using the ``pubdir'' command in the
+ system file. */
+-#define PUBDIR "/usr/spool/uucppublic"
++#define PUBDIR "/var/spool/uucppublic"
+ /* #define PUBDIR "/var/spool/uucppublic" */
+
+ /* The default command path. This is a space separated list of
+@@ -644,21 +644,21 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+ command in the configuration file. */
+-#define LOGFILE "/usr/spool/uucp/Log"
++#define LOGFILE "/var/spool/uucp/Log"
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+ /* #define LOGFILE "/var/log/uucp/Log" */
+
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING. When
+ using HAVE_TAYLOR_CONFIG, this may be overridden by the
+ ``statfile'' command in the configuration file. */
+-#define STATFILE "/usr/spool/uucp/Stats"
++#define STATFILE "/var/spool/uucp/Stats"
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+ /* #define STATFILE "/var/log/uucp/Stats" */
+
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING. When
+ using HAVE_TAYLOR_CONFIG, this may be overridden by the
+ ``debugfile'' command in the configuration file. */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++#define DEBUGFILE "/var/spool/uucp/Debug"
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/log/uucp/Debug" */
+
============================================================
--- packages/uucp/uucp_1.07.bb 6b7273c57f3a954b96cd7f41b3461416fb85e16d
+++ packages/uucp/uucp_1.07.bb 07488d78a44d7740fd396c2e53b9ea02a1da45bf
@@ -1,11 +1,13 @@ DESCRIPTION = "UUCP is used to transfer
DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection."
+HOMEPAGE = "http://www.airs.com/ian/uucp.html"
+SECTION = "console/utils"
LICENSE = "GPLv2"
-SECTION = "console"
-PR = "r1"
+PR = "r2"
inherit autotools
-SRC_URI = "http://ftp.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz \
+ file://policy.patch;patch=1"
do_configure() {
libtoolize --force
@@ -13,8 +15,8 @@ do_install_append() {
}
do_install_append() {
- fakeroot install -d -g uucp -o uucp ${D}/usr/spool/uucp
+ fakeroot install -d -g uucp -o uucp ${D}/var/spool/uucp
}
PACKAGES =+ "cu"
+FILES_cu = "${bindir}/cu /var/spool"
-FILES_cu = "${bindir}/cu /usr/spool"
#
# mt diff -r6ac0eb72e728e774076082cbfbb28ee430dc6485 -rfcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f
#
#
#
# rename "packages/geoclue/geoclue_svn.bb"
# to "packages/geoclue/geoclue_git.bb"
#
# patch "packages/geoclue/geoclue_git.bb"
# from [9fce45165475aab57e6c72a964a90bacb8063222]
# to [10fb14cdb4c1d94164f3d53d63df9c13d1530545]
#
============================================================
--- packages/geoclue/geoclue_svn.bb 9fce45165475aab57e6c72a964a90bacb8063222
+++ packages/geoclue/geoclue_git.bb 10fb14cdb4c1d94164f3d53d63df9c13d1530545
@@ -1,20 +1,20 @@ HOMEPAGE = "http://live.gnome.org/GeoClu
DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application"
HOMEPAGE = "http://live.gnome.org/GeoClue"
-DEPENDS = "gpsd libsoup dbus-glib"
+DEPENDS = "gpsd ilibxml2 libsoup dbus-glib"
-PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PV = "0.0+git${SRCDATE}"
+PR = "r0"
+PE = "1"
inherit autotools pkgconfig
-SRC_URI = "svn://svn.foinse-project.org/geoclue;module=trunk;proto=http"
+SRC_URI = "git://anongit.freedesktop.org/git/geoclue;protocol=git"
-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"
+EXTRA_OECONF = "--enable-panel-applet=no"
-EXTRA_OECONF = "--disable-panel-applet"
-
do_install_append() {
mkdir -p ${D}/usr/share/
cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share
More information about the Openembedded-commits
mailing list