From 8d914cdf124e940b7a06ad3343077b68e01e6019 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 16 Oct 2010 19:53:34 +0200 Subject: system-tools-backends: update to 2.10.1 and make it work with libtool 2.4 --- .../add-angstrom-distro.patch | 28 -------- .../system-tools-backends | 74 ---------------------- .../add-angstrom-distro.patch | 28 ++++++++ .../system-tools-backends | 74 ++++++++++++++++++++++ recipes/gnome/system-tools-backends_2.10.0.bb | 46 -------------- recipes/gnome/system-tools-backends_2.10.1.bb | 48 ++++++++++++++ 6 files changed, 150 insertions(+), 148 deletions(-) delete mode 100644 recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch delete mode 100644 recipes/gnome/system-tools-backends-2.10.0/system-tools-backends create mode 100644 recipes/gnome/system-tools-backends-2.10.1/add-angstrom-distro.patch create mode 100644 recipes/gnome/system-tools-backends-2.10.1/system-tools-backends delete mode 100644 recipes/gnome/system-tools-backends_2.10.0.bb create mode 100644 recipes/gnome/system-tools-backends_2.10.1.bb (limited to 'recipes/gnome') diff --git a/recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch b/recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch deleted file mode 100644 index f258f326c1..0000000000 --- a/recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: system-tools-backends-2.8.3/Utils/Platform.pm -=================================================================== ---- system-tools-backends-2.8.3.orig/Utils/Platform.pm 2010-01-17 16:05:55.794914937 +0000 -+++ system-tools-backends-2.8.3/Utils/Platform.pm 2010-01-17 16:13:07.271917106 +0000 -@@ -91,6 +91,7 @@ - "nexenta-1.0" => [ "Nexenta GNU/Solaris", "1.0", "Ellate" ], - "yellowdog-4.1" => [ "Yellow Dog Linux", "4.1", "Sagitta" ], - "guadalinex-v4" => [ "Guadalinex", "v4", "Toro" ], -+ "angstrom" => [ "Angstrom", "", "" ], - }; - - sub get_platform_info -@@ -141,6 +142,7 @@ - "vine-3.1" => "vine-3.0", - "vlos-1.2" => "gentoo", - "nexenta-1.0" => "solaris-2.11", -+ "angstrom" => "debian-3.0", - ); - - return $metamap{$distro} if ($metamap{$distro}); -@@ -373,6 +375,7 @@ - [ \&check_ark ], - [ \&check_yoper ], - [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], -+ [ \&check_file_exists, "/etc/angstrom-version", "angstrom" ], - ], - "FreeBSD" => [[ \&check_freebsd ]], - "SunOS" => [[ \&check_solaris ]] diff --git a/recipes/gnome/system-tools-backends-2.10.0/system-tools-backends b/recipes/gnome/system-tools-backends-2.10.0/system-tools-backends deleted file mode 100644 index 704c36dbf4..0000000000 --- a/recipes/gnome/system-tools-backends-2.10.0/system-tools-backends +++ /dev/null @@ -1,74 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: system-tools-backends -# Required-Start: $local_fs dbus -# Required-Stop: $local_fs dbus -# Should-Start: $syslog -# Should-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 1 -# Short-Description: Gnome System Tools Backends -# Description: The Gnome System Tools Backends daemon handles root-needed -# operations to configure your machine with the Gnome System -# Tools. -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/system-tools-backends -PIDDIR=/var/run -PIDFILE=$PIDDIR/system-tools-backends.pid -NAME=system-tools-backends -DESC="System Tools Backends" - -test -x $DAEMON || exit 0 - -set -e - -do_start() { - echo "Starting $DESC" - start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE -} - -do_stop() { - echo "Stopping $DESC" - start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/$NAME.pid --exec $DAEMON - #;; - restart|force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart". - # - do_stop - sleep 5 - do_start - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 - diff --git a/recipes/gnome/system-tools-backends-2.10.1/add-angstrom-distro.patch b/recipes/gnome/system-tools-backends-2.10.1/add-angstrom-distro.patch new file mode 100644 index 0000000000..f258f326c1 --- /dev/null +++ b/recipes/gnome/system-tools-backends-2.10.1/add-angstrom-distro.patch @@ -0,0 +1,28 @@ +Index: system-tools-backends-2.8.3/Utils/Platform.pm +=================================================================== +--- system-tools-backends-2.8.3.orig/Utils/Platform.pm 2010-01-17 16:05:55.794914937 +0000 ++++ system-tools-backends-2.8.3/Utils/Platform.pm 2010-01-17 16:13:07.271917106 +0000 +@@ -91,6 +91,7 @@ + "nexenta-1.0" => [ "Nexenta GNU/Solaris", "1.0", "Ellate" ], + "yellowdog-4.1" => [ "Yellow Dog Linux", "4.1", "Sagitta" ], + "guadalinex-v4" => [ "Guadalinex", "v4", "Toro" ], ++ "angstrom" => [ "Angstrom", "", "" ], + }; + + sub get_platform_info +@@ -141,6 +142,7 @@ + "vine-3.1" => "vine-3.0", + "vlos-1.2" => "gentoo", + "nexenta-1.0" => "solaris-2.11", ++ "angstrom" => "debian-3.0", + ); + + return $metamap{$distro} if ($metamap{$distro}); +@@ -373,6 +375,7 @@ + [ \&check_ark ], + [ \&check_yoper ], + [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], ++ [ \&check_file_exists, "/etc/angstrom-version", "angstrom" ], + ], + "FreeBSD" => [[ \&check_freebsd ]], + "SunOS" => [[ \&check_solaris ]] diff --git a/recipes/gnome/system-tools-backends-2.10.1/system-tools-backends b/recipes/gnome/system-tools-backends-2.10.1/system-tools-backends new file mode 100644 index 0000000000..704c36dbf4 --- /dev/null +++ b/recipes/gnome/system-tools-backends-2.10.1/system-tools-backends @@ -0,0 +1,74 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: system-tools-backends +# Required-Start: $local_fs dbus +# Required-Stop: $local_fs dbus +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: Gnome System Tools Backends +# Description: The Gnome System Tools Backends daemon handles root-needed +# operations to configure your machine with the Gnome System +# Tools. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/system-tools-backends +PIDDIR=/var/run +PIDFILE=$PIDDIR/system-tools-backends.pid +NAME=system-tools-backends +DESC="System Tools Backends" + +test -x $DAEMON || exit 0 + +set -e + +do_start() { + echo "Starting $DESC" + start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE +} + +do_stop() { + echo "Stopping $DESC" + start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON +} + +case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + do_stop + sleep 5 + do_start + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 + diff --git a/recipes/gnome/system-tools-backends_2.10.0.bb b/recipes/gnome/system-tools-backends_2.10.0.bb deleted file mode 100644 index 4619d357b5..0000000000 --- a/recipes/gnome/system-tools-backends_2.10.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "gnome system tools backends" -LICENSE = "GPL" - -DEPENDS = "dbus dbus-glib glib-2.0 policykit" - -# Shadow added so there is a full adduser/deluser -# (Gnome images tend to pull in shadow anyway) -RDEPENDS_${PN} = "shadow" -PR = "r1" - -inherit gnome pkgconfig update-rc.d - -SRC_URI += " \ - file://system-tools-backends \ - " - -SRC_URI_append_angstrom = " \ - file://add-angstrom-distro.patch \ - " - -SRC_URI[archive.md5sum] = "01fd8fcfbe5f68492186404c96af915a" -SRC_URI[archive.sha256sum] = "5afea48c0c195dd3b6e0b87a586c08bf614942d4bcb60449fd9f65d95418b60d" - -EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " - -do_configure() { - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in - gnu-configize - oe_runconf -} - -do_install_append () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ -} - -INITSCRIPT_NAME = "system-tools-backends" -INITSCRIPT_PARAMS = "start 50 2 3 4 5 . stop 70 1 ." - -FILES_${PN} += " ${sysconfdir}/dbus-1/system.d" -FILES_${PN} += " ${libdir}/pkgconfig" -FILES_${PN} += " ${datadir}/dbus-1/system-services" -FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files" -FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts" -FILES_${PN} += " ${datadir}/polkit*" diff --git a/recipes/gnome/system-tools-backends_2.10.1.bb b/recipes/gnome/system-tools-backends_2.10.1.bb new file mode 100644 index 0000000000..bc88cbe164 --- /dev/null +++ b/recipes/gnome/system-tools-backends_2.10.1.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "gnome system tools backends" +LICENSE = "GPL" + +DEPENDS = "dbus dbus-glib glib-2.0 policykit" + +# Shadow added so there is a full adduser/deluser +# (Gnome images tend to pull in shadow anyway) +RDEPENDS_${PN} = "shadow" + +inherit gnome pkgconfig update-rc.d gettext + +SRC_URI[archive.md5sum] = "bde46137761df8849d6ee176449f84f5" +SRC_URI[archive.sha256sum] = "0c1cfdf5f0550c0ccacbbc4f00ed059ab9ea483d48138132db44b3a20575d7b4" + +SRC_URI += " \ + file://system-tools-backends \ + " + +SRC_URI_append_angstrom = " \ + file://add-angstrom-distro.patch \ + " + +EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " + +do_configure() { + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in + libtoolize --force --install + aclocal + gnu-configize + oe_runconf + cp ${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool ${S} +} + +do_install_append () { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ +} + +INITSCRIPT_NAME = "system-tools-backends" +INITSCRIPT_PARAMS = "start 50 2 3 4 5 . stop 70 1 ." + +FILES_${PN} += " ${sysconfdir}/dbus-1/system.d" +FILES_${PN} += " ${libdir}/pkgconfig" +FILES_${PN} += " ${datadir}/dbus-1/system-services" +FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files" +FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts" +FILES_${PN} += " ${datadir}/polkit*" -- cgit 1.2.3-korg