public inbox for gentoo-user@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-user] lm_sensors patch borked?
@ 2010-06-28 14:14 Mick
  2010-06-28 14:40 ` justin
  0 siblings, 1 reply; 3+ messages in thread
From: Mick @ 2010-06-28 14:14 UTC (permalink / raw
  To: gentoo-user

The emerge of sys-apps/lm_sensors-3.1.2-r1 fails as follows:
=================================================
# emerge -uDv world

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild     U ] sys-apps/lm_sensors-3.1.2-r1 [3.1.2] USE="-sensord" 0 kB

Total: 1 package (1 upgrade), Size of downloads: 0 kB


>>> Verifying ebuild manifests

>>> Emerging (1 of 1) sys-apps/lm_sensors-3.1.2-r1
 * lm_sensors-3.1.2.tar.bz2 RMD160 SHA1 SHA256 size ;-) ...            [ ok ]
 * checking ebuild checksums ;-) ...                                   [ ok ]
 * checking auxfile checksums ;-) ...                                  [ ok ]
 * checking miscfile checksums ;-) ...                                 [ ok ]
 * CPV:  sys-apps/lm_sensors-3.1.2-r1
 * REPO: gentoo
 * USE:  amd64 elibc_glibc kernel_linux multilib userland_GNU
 * Determining the location of the kernel source code
 * Found kernel source directory:
 *     /usr/src/linux
 * Found kernel object directory:
 *     /lib/modules/2.6.33-gentoo-r2/build
 * Found sources for kernel version:
 *     2.6.33-gentoo-r2
 * Checking for suitable kernel configuration options...                [ ok ]
>>> Unpacking source...
>>> Unpacking lm_sensors-3.1.2.tar.bz2 to /var/tmp/portage/sys-apps/lm_sensors-3.1.2-r1/work
>>> Source unpacked in /var/tmp/portage/sys-apps/lm_sensors-3.1.2-r1/work
>>> Preparing source in /var/tmp/portage/sys-apps/lm_sensors-3.1.2-r1/work/lm_sensors-3.1.2 ...
 * Applying lm_sensors-3.1.2-sensors-detect-gentoo.patch ...            [ ok ]
 * Applying lm_sensors-3.1.2-changeset_r5835.patch ...

 * Failed Patch: lm_sensors-3.1.2-changeset_r5835.patch !
 *  ( /usr/portage/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
)
=================================================

This is what the  patch.out file says:

***** lm_sensors-3.1.2-changeset_r5835.patch *****

==================================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch <
'/usr/portage/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch'

==================================================
patching file prog/sensord/rrd.c
Hunk #1 FAILED at 138.
Hunk #2 FAILED at 150.
Hunk #3 FAILED at 161.
Hunk #4 FAILED at 187.
Hunk #5 FAILED at 200.
5 out of 5 hunks FAILED -- saving rejects to file prog/sensord/rrd.c.rej
==================================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch <
'/usr/portage/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch'

==================================================
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|http://bugs.gentoo.org/325083
|http://www.lm-sensors.org/changeset/5835
|
|--- prog/sensord/rrd.c
|+++ prog/sensord/rrd.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
No file to patch.  Skipping patch.
No file to patch.  Skipping patch.
No file to patch.  Skipping patch.
***** lm_sensors-3.1.2-changeset_r5835.patch *****

==================================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-ap
ps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch'

==================================================
patching file prog/sensord/rrd.c
Hunk #1 FAILED at 138.
Hunk #2 FAILED at 150.
Hunk #3 FAILED at 161.
Hunk #4 FAILED at 187.
Hunk #5 FAILED at 200.
5 out of 5 hunks FAILED -- saving rejects to file prog/sensord/rrd.c.rej
==================================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-ap
ps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch'

==================================================
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|http://bugs.gentoo.org/325083
|http://www.lm-sensors.org/changeset/5835
|
|--- prog/sensord/rrd.c
|+++ prog/sensord/rrd.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
==================================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-ap
ps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch'

==================================================
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|http://bugs.gentoo.org/325083
|http://www.lm-sensors.org/changeset/5835
|
|--- prog/sensord/rrd.c
|+++ prog/sensord/rrd.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
==================================================

Shall I delete the patch from
/usr/portage/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
and resync?
-- 
Regards,
Mick



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [gentoo-user] lm_sensors patch borked?
  2010-06-28 14:14 [gentoo-user] lm_sensors patch borked? Mick
@ 2010-06-28 14:40 ` justin
  2010-06-28 16:12   ` Mick
  0 siblings, 1 reply; 3+ messages in thread
From: justin @ 2010-06-28 14:40 UTC (permalink / raw
  To: gentoo-user

[-- Attachment #1: Type: text/plain, Size: 104 bytes --]

The patch was borked. Either bump to latest sys-devel/patch-2.6.1 or
resync later. It is fixed now.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [gentoo-user] lm_sensors patch borked?
  2010-06-28 14:40 ` justin
@ 2010-06-28 16:12   ` Mick
  0 siblings, 0 replies; 3+ messages in thread
From: Mick @ 2010-06-28 16:12 UTC (permalink / raw
  To: gentoo-user

On 28 June 2010 15:40, justin <justin@j-schmitz.net> wrote:
> The patch was borked. Either bump to latest sys-devel/patch-2.6.1 or
> resync later. It is fixed now.


Thanks, will have another go.

-- 
Regards,
Mick



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-06-28 16:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-28 14:14 [gentoo-user] lm_sensors patch borked? Mick
2010-06-28 14:40 ` justin
2010-06-28 16:12   ` Mick

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox