Hello community, here is the log from the commit of package fxload for openSUSE:Factory checked in at 2014-01-13 10:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fxload (Old) and /work/SRC/openSUSE:Factory/.fxload.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fxload" Changes: -------- --- /work/SRC/openSUSE:Factory/fxload/fxload.changes 2012-02-20 16:10:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fxload.new/fxload.changes 2014-01-13 10:52:59.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Jan 12 12:09:58 UTC 2014 - [email protected] + +- added patches: + * fxload-2008_10_13-prefer_DEVNAME.patch + This uses the more modern DEVNAME variable instead of DEVICE to + work better with current udev / kernels +- avoid usage of __DATE__ in version output, use modification time + of .changes file instead + +------------------------------------------------------------------- New: ---- fxload-2008_10_13-prefer_DEVNAME.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fxload.spec ++++++ --- /var/tmp/diff_new_pack.J23Fs1/_old 2014-01-13 10:53:00.000000000 +0100 +++ /var/tmp/diff_new_pack.J23Fs1/_new 2014-01-13 10:53:00.000000000 +0100 @@ -1,7 +1,8 @@ # # spec file for package fxload # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +27,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://mesh.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2008_10_13.tar.bz2 Patch0: fxload-2002_04_11.patch +# PATCH-FIX-UPSTREAM fxload-2008_10_13-prefer_DEVNAME.patch lp#156085 -- [email protected] +Patch1: fxload-2008_10_13-prefer_DEVNAME.patch ExclusiveArch: %ix86 ppc ppc64 ia64 %sparc x86_64 %arm %description @@ -47,9 +50,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -make CC="%__cc" CFLAGS="$RPM_OPT_FLAGS -Wall -g" +# use date of .changes file instead of __DATE__ +# to avoid useless republishing +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +make CC="%__cc" CFLAGS="$RPM_OPT_FLAGS -Wall -g -DFXLOAD_VERSION=\"\\\"$FAKE_BUILDDATE (development)\\\"\"" %install %make_install @@ -63,7 +70,7 @@ #UsrMerge /sbin/* #EndUsrMerge -%attr(755,root,root) %{_sbindir} +%attr(755,root,root) %{_sbindir}/fxload %{_mandir}/man?/* %dir /usr/share/usb /usr/share/usb/a3load.hex ++++++ fxload-2008_10_13-prefer_DEVNAME.patch ++++++ Author: Stefan Seyfried <[email protected]> Subject: Adapt fxload to newer udev Actually this patch is from ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/156085/comments/102 * Use DEVNAME from the environment in preference to DEVICE, the former contains the modern /dev/bus/usb path. LP: #156085. Index: b/main.c =================================================================== --- a/main.c +++ b/main.c @@ -32,23 +32,23 @@ * -s <path> -- use this second stage loader * -c <byte> -- Download to EEPROM, with this config byte * * -L <path> -- Create a symbolic link to the device. * -m <mode> -- Set the permissions on the device after download. - * -D <path> -- Use this device, instead of $DEVICE + * -D <path> -- Use this device, instead of $DEVNAME or $DEVICE * * -V -- Print version ID for program * * This program is intended to be started by hotplug scripts in * response to a device appearing on the bus. It therefore also * expects these environment variables which are passed by hotplug to * its sub-scripts: * - * DEVICE=<path> - * This is the path to the device is /proc/bus/usb. It is the - * complete path to the device, that I can pass to open and - * manipulate as a USB device. + * DEVNAME=<path>, DEVICE=<path> + * This is the path to the device in /dev/bus/usb or + * /proc/bus/usb. It is the complete path to the device, that + * I can pass to open and manipulate as a USB device. */ # include <stdlib.h> # include <stdio.h> # include <getopt.h> @@ -89,17 +89,20 @@ void logerror(const char *format, ...) int main(int argc, char*argv[]) { const char *link_path = 0; const char *ihex_path = 0; - const char *device_path = getenv("DEVICE"); + const char *device_path = getenv("DEVNAME"); const char *type = 0; const char *stage1 = 0; mode_t mode = 0; int opt; int config = -1; + if (!device_path) + device_path = getenv("DEVICE"); + while ((opt = getopt (argc, argv, "2vV?D:I:L:c:lm:s:t:")) != EOF) switch (opt) { case '2': // original version of "-t fx2" type = "fx2"; @@ -189,11 +192,11 @@ usage: fputs (argv [0], stderr); fputs (" [-vV] [-l] [-t type] [-D devpath]\n", stderr); fputs ("\t\t[-I firmware_hexfile] ", stderr); fputs ("[-s loader] [-c config_byte]\n", stderr); fputs ("\t\t[-L link] [-m mode]\n", stderr); - fputs ("... [-D devpath] overrides DEVICE= in env\n", stderr); + fputs ("... [-D devpath] overrides DEVNAME= and DEVICE= in env\n", stderr); fputs ("... device types: one of an21, fx, fx2, fx2lp\n", stderr); fputs ("... at least one of -I, -L, -m is required\n", stderr); return -1; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
