From 02cc40c6ed09c3bb715391d07be2626f7ef88160 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 16:15:42 +0200
Subject: gnome-mplayer: unify * add AUTHOR and SECTION (partly closes #4575) *
fix HOMEPAGE * both recipes were unbuildable before this commit and are still
unbuildable Unbreaking the recipes will be done in separate commits.
---
recipes/gnome-mplayer/gnome-mplayer.inc | 14 ++++++++++++++
recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb | 16 +++-------------
recipes/gnome-mplayer/gnome-mplayer_cvs.bb | 17 ++++-------------
3 files changed, 21 insertions(+), 26 deletions(-)
create mode 100644 recipes/gnome-mplayer/gnome-mplayer.inc
(limited to 'recipes')
diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
new file mode 100644
index 0000000000..d1d25b8927
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
+AUTHOR = "Kevin DeKorte <kdekorte@gmail.com>"
+HOMEPAGE = "http://code.google.com/p/gnome-mplayer/"
+SECTION = "x11/multimedia"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gconf dbus-glib"
+RDEPENDS = "mplayer"
+
+inherit autotools pkgconfig gconf
+
+SRC_URI += "file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1 \
+ file://uchar-for-utf8-check.patch;patch=1 \
+ file://non-utf8-id3-fallback.patch;patch=1"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
index c01152cfb8..91129310a3 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -1,14 +1,4 @@
-DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
-HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
-LICENSE = "GPL"
-DEPENDS = "gtk+ gconf dbus-glib"
-RDEPENDS = "mplayer"
-PR = "r3"
+require gnome-mplayer.inc
-inherit autotools pkgconfig gconf
-
-SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
- file://ac-gthread.patch;patch=1 \
- file://1.patch;patch=1 \
- file://uchar-for-utf8-check.patch;patch=1 \
- file://non-utf8-id3-fallback.patch;patch=1"
+PR = "r4"
+SRC_URI += "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
index 5b0cb41707..57c6673d68 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
@@ -1,21 +1,12 @@
-DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
-HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
-LICENSE = "GPL"
-DEPENDS = "gtk+ gconf dbus-glib"
-RDEPENDS = "mplayer"
+require gnome-mplayer.inc
+
SRCDATE = "20080101"
PV = "0.5.3+cvs${SRCDATE}"
-PR = "r5"
-
-inherit autotools pkgconfig gconf
+PR = "r6"
S = "${WORKDIR}/${PN}"
-SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \
- file://ac-gthread.patch;patch=1 \
- file://1.patch;patch=1 \
- file://uchar-for-utf8-check.patch;patch=1 \
- file://non-utf8-id3-fallback.patch;patch=1"
+SRC_URI += "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN}"
do_install_append() {
sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop
--
cgit v1.2.3
From 8722f3a634adea44e10a5235c45c117f55e1721a Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 16:33:57 +0200
Subject: gnome-mplayer: point svn to googlecode.com. builds fine.
---
recipes/gnome-mplayer/gnome-mplayer_cvs.bb | 14 --------------
recipes/gnome-mplayer/gnome-mplayer_svn.bb | 13 +++++++++++++
2 files changed, 13 insertions(+), 14 deletions(-)
delete mode 100644 recipes/gnome-mplayer/gnome-mplayer_cvs.bb
create mode 100644 recipes/gnome-mplayer/gnome-mplayer_svn.bb
(limited to 'recipes')
diff --git a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
deleted file mode 100644
index 57c6673d68..0000000000
--- a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require gnome-mplayer.inc
-
-SRCDATE = "20080101"
-PV = "0.5.3+cvs${SRCDATE}"
-PR = "r6"
-
-S = "${WORKDIR}/${PN}"
-
-SRC_URI += "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN}"
-
-do_install_append() {
- sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop
-}
-
diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
new file mode 100644
index 0000000000..06686997cb
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
@@ -0,0 +1,13 @@
+require gnome-mplayer.inc
+
+SRCDATE = "20080101"
+PV = "0.5.3+svn${SRCDATE}"
+PR = "r6"
+S = "${WORKDIR}/trunk"
+
+SRC_URI += "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http"
+
+do_install_append() {
+ sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop
+}
+
--
cgit v1.2.3
From aa29e813319119d3e510db05da50d985b976ced2 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 17:33:15 +0200
Subject: gnome-mplayer: unbreak 0.5.3 * rearrange the SRC_URI situation and
point to googlecode.com * the patches don't apply to the released versions,
but only to SVN
---
recipes/gnome-mplayer/gnome-mplayer.inc | 5 +----
recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb | 3 +--
recipes/gnome-mplayer/gnome-mplayer_svn.bb | 8 ++++++--
3 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'recipes')
diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
index d1d25b8927..15808a11b4 100644
--- a/recipes/gnome-mplayer/gnome-mplayer.inc
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -8,7 +8,4 @@ RDEPENDS = "mplayer"
inherit autotools pkgconfig gconf
-SRC_URI += "file://ac-gthread.patch;patch=1 \
- file://1.patch;patch=1 \
- file://uchar-for-utf8-check.patch;patch=1 \
- file://non-utf8-id3-fallback.patch;patch=1"
+SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
index 91129310a3..81031d0ba2 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -1,4 +1,3 @@
require gnome-mplayer.inc
-PR = "r4"
-SRC_URI += "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz"
+PR = "r5"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
index 06686997cb..fa270f674e 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
@@ -1,11 +1,15 @@
require gnome-mplayer.inc
SRCDATE = "20080101"
-PV = "0.5.3+svn${SRCDATE}"
+PV = "0.9.5+svn${SRCDATE}"
PR = "r6"
S = "${WORKDIR}/trunk"
-SRC_URI += "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http"
+SRC_URI = "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http \
+ file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1 \
+ file://uchar-for-utf8-check.patch;patch=1 \
+ file://non-utf8-id3-fallback.patch;patch=1"
do_install_append() {
sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop
--
cgit v1.2.3
From 57f3352b983cf6374c031fddd65ee8a82ae9b1e7 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 17:43:55 +0200
Subject: gnome-mplayer: add 0.9.5. (Closes: #4575)
---
recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb
(limited to 'recipes')
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb
new file mode 100644
index 0000000000..81031d0ba2
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb
@@ -0,0 +1,3 @@
+require gnome-mplayer.inc
+
+PR = "r5"
--
cgit v1.2.3
From 199f38cafe7019a0c20824dd0da945dcbbbc478c Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 18:10:22 +0200
Subject: cellwriter: update to 1.3.4
---
recipes/cellwriter/cellwriter_1.3.3.bb | 13 -------------
recipes/cellwriter/cellwriter_1.3.4.bb | 13 +++++++++++++
2 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 recipes/cellwriter/cellwriter_1.3.3.bb
create mode 100644 recipes/cellwriter/cellwriter_1.3.4.bb
(limited to 'recipes')
diff --git a/recipes/cellwriter/cellwriter_1.3.3.bb b/recipes/cellwriter/cellwriter_1.3.3.bb
deleted file mode 100644
index 12ec70a48f..0000000000
--- a/recipes/cellwriter/cellwriter_1.3.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "A grid-entry natural handwriting input panel"
-SECTION = "x11/input"
-AUTHOR = "Michael Levin"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libxtst"
-
-SRC_URI = "http://pub.risujin.org/cellwriter/${PN}-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--without-gnome"
-
-FILES_${PN} += "${datadir}/icons"
diff --git a/recipes/cellwriter/cellwriter_1.3.4.bb b/recipes/cellwriter/cellwriter_1.3.4.bb
new file mode 100644
index 0000000000..12ec70a48f
--- /dev/null
+++ b/recipes/cellwriter/cellwriter_1.3.4.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "A grid-entry natural handwriting input panel"
+SECTION = "x11/input"
+AUTHOR = "Michael Levin"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libxtst"
+
+SRC_URI = "http://pub.risujin.org/cellwriter/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-gnome"
+
+FILES_${PN} += "${datadir}/icons"
--
cgit v1.2.3
From 1e0d96b7d4e6b2643e2551fa8dcebd4df2045fda Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 19 May 2009 21:34:57 +0200
Subject: netcat: use update-alternatives class (thx Koen)
---
recipes/netcat/netcat_0.7.1.bb | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'recipes')
diff --git a/recipes/netcat/netcat_0.7.1.bb b/recipes/netcat/netcat_0.7.1.bb
index cc5b9e2d6e..7c4dfc5375 100644
--- a/recipes/netcat/netcat_0.7.1.bb
+++ b/recipes/netcat/netcat_0.7.1.bb
@@ -2,20 +2,17 @@ DESCRIPTION = "GNU Netcat"
HOMEPAGE = "http://netcat.sourceforge.net"
SECTION = "console/network"
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
-inherit autotools
+inherit autotools update-alternatives
do_install_append() {
mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
}
-pkg_postinst_${PN} () {
- update-alternatives --install ${bindir}/nc nc nc.${PN} 100
-}
-
-pkg_prerm_${PN} () {
- update-alternatives --remove nc nc.${PN}
-}
+ALTERNATIVE_NAME = "nc"
+ALTERNATIVE_LINK = "${bindir}/nc"
+ALTERNATIVE_PATH = "${bindir}/nc.${PN}"
+ALTERNATIVE_PRIORITY = "100"
--
cgit v1.2.3
From 9fb58d79a6a5d96af251ace28669243ba37d77e0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 19 May 2009 21:45:49 +0200
Subject: tftp-hpa: added 5.0 version of HPA tftp client/daemon
---
recipes/tftp-hpa/files/default | 3 ++
recipes/tftp-hpa/files/init | 104 +++++++++++++++++++++++++++++++++++++++
recipes/tftp-hpa/tftp-hpa_5.0.bb | 71 ++++++++++++++++++++++++++
3 files changed, 178 insertions(+)
create mode 100644 recipes/tftp-hpa/files/default
create mode 100644 recipes/tftp-hpa/files/init
create mode 100644 recipes/tftp-hpa/tftp-hpa_5.0.bb
(limited to 'recipes')
diff --git a/recipes/tftp-hpa/files/default b/recipes/tftp-hpa/files/default
new file mode 100644
index 0000000000..de2ed18202
--- /dev/null
+++ b/recipes/tftp-hpa/files/default
@@ -0,0 +1,3 @@
+#Defaults for tftpd-hpa
+RUN_DAEMON="yes"
+OPTIONS="-l -s /srv/tftpboot"
diff --git a/recipes/tftp-hpa/files/init b/recipes/tftp-hpa/files/init
new file mode 100644
index 0000000000..2a24884550
--- /dev/null
+++ b/recipes/tftp-hpa/files/init
@@ -0,0 +1,104 @@
+#! /bin/sh
+#
+# Author: Jaakko Niemi <liiwi@iki.fi>
+# Modified from skeleton file in sarge
+
+### BEGIN INIT INFO
+# Provides: tftp-hpa
+# Required-Start: $local_fs $remote_fs $syslog $network
+# Required-Stop: $local_fs $remote_fs $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 1
+# Short-Description: HPA's tftp client
+# Description: tftp server to allow booting clients which support
+# the PXE protocol.
+### END INIT INFO
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="HPA's tftpd"
+NAME=in.tftpd
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/tftpd-hpa
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+# Read config file if it is present.
+if [ -r /etc/default/tftpd-hpa ]
+then
+ . /etc/default/tftpd-hpa
+fi
+
+if [ "$RUN_DAEMON" != "yes" ] ; then
+ echo "tftpd-hpa disabled in /etc/default/tftpd-hpa"
+ exit 0
+fi
+
+#
+# Function that starts the daemon/service.
+#
+d_start() {
+ start-stop-daemon --start --quiet --exec $DAEMON -- $OPTIONS
+}
+
+#
+# Function that stops the daemon/service.
+#
+d_stop() {
+ start-stop-daemon --stop --quiet --name $NAME
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service.
+#
+d_reload() {
+ start-stop-daemon --stop --quiet --name $NAME --signal 1
+}
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME"
+ d_start
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME"
+ d_stop
+ echo "."
+ ;;
+ #reload)
+ #
+ # If the daemon can reload its configuration without
+ # restarting (for example, when it is sent a SIGHUP),
+ # then implement that here.
+ #
+ # If the daemon responds to changes in its config file
+ # directly anyway, make this an "exit 0".
+ #
+ # echo -n "Reloading $DESC configuration..."
+ # d_reload
+ # echo "done."
+ #;;
+ 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".
+ #
+ echo -n "Restarting $DESC: $NAME"
+ d_stop
+ sleep 1
+ d_start
+ echo "."
+ ;;
+ *)
+ # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/recipes/tftp-hpa/tftp-hpa_5.0.bb b/recipes/tftp-hpa/tftp-hpa_5.0.bb
new file mode 100644
index 0000000000..4137bf0bab
--- /dev/null
+++ b/recipes/tftp-hpa/tftp-hpa_5.0.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "HPA's tftp server"
+DEPENDS = "tcp-wrappers readline"
+SECTION = "network"
+LICENSE = "BSD"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/software/network/tftp/tftp-hpa-${PV}.tar.bz2 \
+ file://default \
+ file://init"
+
+inherit autotools update-alternatives
+
+# configure.in has errors
+do_configure() {
+ oe_runconf
+}
+
+do_install() {
+ oe_runmake install INSTALLROOT=${D}
+
+ mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN}
+
+ install -d ${D}${sysconfdir}/default
+ install -d ${D}${sysconfdir}/init.d
+
+ install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftp-hpa
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftp-hpa
+}
+
+
+INITSCRIPT_NAME = "${PN}"
+INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ."
+
+PACKAGES += "tftpd-hpa"
+
+FILES_${PN} = "${bindir}"
+FILES_tftpd-hpa = "${sbindir} ${sysconfdir}"
+CONFFILES_tftpd-hpa = "${sysconfdir}/default/${PN}"
+
+ALTERNATIVE_NAME = "tftp"
+ALTERNATIVE_LINK = "${bindir}/tftp"
+ALTERNATIVE_PATH = "${bindir}/tftp.${PN}"
+ALTERNATIVE_PRIORITY = "50"
+
+
+# This is taken from update-rc.d.bbclass which works only for $PN package
+# so I had to do that way
+
+postinst_tftpd-hpa() {
+if test "x$D" != "x"; then
+ OPT="-r $D"
+else
+ OPT="-s"
+fi
+update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
+}
+
+prerm_tftpd-hpa() {
+if test "x$D" = "x"; then
+ ${sysconfdir}/init.d/${INITSCRIPT_NAME} stop
+fi
+}
+
+postrm_tftpd-hpa() {
+if test "x$D" != "x"; then
+ OPT="-r $D"
+else
+ OPT=""
+fi
+update-rc.d $OPT ${INITSCRIPT_NAME} remove
+}
+
--
cgit v1.2.3
From 5d7b852d1b7e2d34a803ce01c0ea96bc926f96bd Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Tue, 19 May 2009 23:37:47 +0200
Subject: kexec-tools-static_2.0.0: add --nostdinc to purgatory Makefile
makefile
---
recipes/kexec/files/kexec2-klibc.patch | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
(limited to 'recipes')
diff --git a/recipes/kexec/files/kexec2-klibc.patch b/recipes/kexec/files/kexec2-klibc.patch
index b80848d291..a7dbe61d13 100644
--- a/recipes/kexec/files/kexec2-klibc.patch
+++ b/recipes/kexec/files/kexec2-klibc.patch
@@ -55,19 +55,16 @@ Index: kexec-tools-2.0.0/kexec/ifdown.c
#include <netinet/in.h>
Index: kexec-tools-2.0.0/purgatory/Makefile
===================================================================
---- kexec-tools-2.0.0.orig/purgatory/Makefile 2009-04-24 14:15:34.037827479 +0100
-+++ kexec-tools-2.0.0/purgatory/Makefile 2009-04-24 14:15:47.022825503 +0100
-@@ -55,9 +54,7 @@
- -I$(srcdir)/purgatory/arch/$(ARCH)/include \
- -I$(srcdir)/util_lib/include \
- -I$(shell $(CC) -print-file-name=include)
--$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
-- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \
-- -e purgatory_start -r
-+$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)
+--- kexec-tools-2.0.0.orig/purgatory/Makefile 2009-05-19 14:15:34.037827479 +0100
++++ kexec-tools-2.0.0/purgatory/Makefile 2009-05-19 14:15:47.022825503 +0100
+@@ -47,6 +47,7 @@
+ $(PURGATORY): CC=$(TARGET_CC)
+ $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
+ -Os -fno-builtin -ffreestanding \
++ -nostdinc \
+ -fno-zero-initialized-in-bss
- $(PURGATORY): $(PURGATORY_OBJS)
- $(MKDIR) -p $(@D)
+ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
Index: kexec-tools-2.0.0/purgatory/purgatory.c
===================================================================
--- kexec-tools-2.0.0.orig/purgatory/purgatory.old 2009-05-16 13:28:19.000000000 +0200
--
cgit v1.2.3
From e373e7e4f0dec5f2a18055f97a40ff679e0fdde8 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 23:48:42 +0200
Subject: kanatest: fight some bitrot (SRC_URI, HOMEPAGE, etc.)
---
recipes/kanatest/kanatest.inc | 11 ++++++++---
recipes/kanatest/kanatest_0.3.6.bb | 9 +++------
2 files changed, 11 insertions(+), 9 deletions(-)
(limited to 'recipes')
diff --git a/recipes/kanatest/kanatest.inc b/recipes/kanatest/kanatest.inc
index 254091c60c..64f87616c2 100644
--- a/recipes/kanatest/kanatest.inc
+++ b/recipes/kanatest/kanatest.inc
@@ -1,14 +1,19 @@
-SECTION = "gpe/games"
DESCRIPTION = "Hiragana and Katakana drill tool"
+HOMEPAGE = "http://clayo.org/kanatest/
+SECTION = "gpe/games"
LICENSE = "GPL"
-
DEPENDS = "gtk+"
-FILES_${PN} = "${bindir}/${PN} ${datadir}/${PN} ${datadir}/pixmaps ${datadir}/applications"
+SRC_URI = "http://clayo.org/kanatest/${PN}-${PV}.tar.gz \
+ file://${PN}.desktop"
inherit autotools gettext
+CFLAGS += "-D_GNU_SOURCE"
+
do_install_append () {
install -d ${D}${datadir}/applications/
install -m 0644 ${WORKDIR}/${PN}.desktop ${D}${datadir}/applications/${PN}.desktop
}
+
+FILES_${PN} = "${bindir}/${PN} ${datadir}/${PN} ${datadir}/pixmaps ${datadir}/applications"
diff --git a/recipes/kanatest/kanatest_0.3.6.bb b/recipes/kanatest/kanatest_0.3.6.bb
index f0b17a2af9..809812f1ce 100644
--- a/recipes/kanatest/kanatest_0.3.6.bb
+++ b/recipes/kanatest/kanatest_0.3.6.bb
@@ -1,8 +1,5 @@
-PR = "r0"
-
-SRC_URI = "http://clay.ll.pl/download/${PN}-${PV}.tar.gz file://${PN}.desktop"
-
require kanatest.inc
-CFLAGS += "-D_GNU_SOURCE"
-
+PR = "r1"
+SRC_URI = "${DEBIAN_MIRROR}/main/k/kanatest/${PN}_${PV}.orig.tar.gz \
+ file://${PN}.desktop"
--
cgit v1.2.3
From e6a8ba0d167398f6653b86dcdac25c3d33aee6ca Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Wed, 20 May 2009 00:11:30 +0200
Subject: kanatest: add 0.4.8
---
recipes/kanatest/kanatest_0.4.8.bb | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 recipes/kanatest/kanatest_0.4.8.bb
(limited to 'recipes')
diff --git a/recipes/kanatest/kanatest_0.4.8.bb b/recipes/kanatest/kanatest_0.4.8.bb
new file mode 100644
index 0000000000..1d71e27db2
--- /dev/null
+++ b/recipes/kanatest/kanatest_0.4.8.bb
@@ -0,0 +1,3 @@
+require kanatest.inc
+
+PR = "r0"
--
cgit v1.2.3