Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 54211 - [2.4] Patch error in gentoo-sources-2.4.20-r18
Summary: [2.4] Patch error in gentoo-sources-2.4.20-r18
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: x86 Linux
: High major (vote)
Assignee: x86-kernel@gentoo.org (DEPRECATED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-06-17 08:58 UTC by Jean-Claude Repetto
Modified: 2004-06-22 07:07 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
Patch (gentoo-sources-2.4.20-r19.bug-54211.patch,570 bytes, patch)
2004-06-21 13:23 UTC, Tim Yamin (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jean-Claude Repetto 2004-06-17 08:58:32 UTC
When I try to emerge gentoo-sources-2.4.20-r18, it fails :

91_fix_cryptoOrder: 2 out of 2 hunks FAILED -- saving rejects t                                                        o file Makefile.rej
can't be applied.  Please modify the patch.


Reproducible: Always
Steps to Reproduce:
1.cd /usr/portage/sys-kernel/gentoo-sources/
2.emerge gentoo-sources-2.4.20-r18.ebuild

Actual Results:  
>>> md5 src_uri ;-) linux-2.4.20.tar.bz2
>>> md5 src_uri ;-) patches-2.4.20-gentoo-r14.tar.bz2
>>> Unpacking source...
>>> Unpacking linux-2.4.20.tar.bz2 to /var/tmp/portage/gentoo-sources-2.4.20-r18
/work
>>> Unpacking patches-2.4.20-gentoo-r14.tar.bz2 to /var/tmp/portage/gentoo-sourc
es-2.4.20-r18/work
 * Setting up kernel for rmap support(default).
 * Dropping 012_ea+acl+nfsacl-2.4.20-0.8.56.aavm...
 * Dropping 014_grsecurity-1.9.9g-2.4.20.aavm...
 * Dropping 017_ntfs-2.1.4a.aavm...
 * Dropping 101_evms-common-1.2.1.aavm...
 * Dropping 200_device-mapper-00001.patch.aavm...
 * Dropping 903_grsec_quick_fix.aavm...
 * Dropping 993_usbvision.aavm...
 * Enabling gcc > 3.1 processor optimizations...
 * To use them, choose the processor families labelled with (gcc>31)
 * in "Processor type and features -> Processor Family"
 * Setting up kernel for EVMS 1.2.1 support (default)...
 * Dropping 200_device-mapper-00001.patch.rmap...
 * Dropping 201_device-mapper-00002.patch...
 * Dropping 202_device-mapper-00003.patch...
 * Dropping 203_device-mapper-00004.patch...
 * Dropping 204_device-mapper-00005.patch...
 * Dropping 205_device-mapper-00006.patch...
 * Dropping 206_device-mapper-00007.patch...
 * Dropping 207_device-mapper-00008.patch...
 * Dropping 208_device-mapper-00009.patch...
 * Dropping 209_device-mapper-00010.patch...
 * Dropping 210_device-mapper-00011.patch...
 * Dropping 211_device-mapper-00012.patch...
 * Dropping 212_device-mapper-00013.patch...
 * Dropping 213_device-mapper-00014.patch...
 * Dropping 214_device-mapper-00015.patch...
 * Dropping 215_device-mapper-00016.patch...
 * Dropping 216_device-mapper-00017.patch...
 * Dropping 217_device-mapper-00018.patch...
 * Dropping 218_device-mapper-00019.patch...
 * Dropping 219_device-mapper-00020.patch...
 * Dropping 220_device-mapper-00021.patch...
 * Dropping 221_device-mapper-00022.patch...
 * Dropping 222_device-mapper-00023.patch...
 * Dropping 223_device-mapper-00024.patch...
 * Dropping 224_device-mapper-00025.patch...
 * Dropping 225_device-mapper-00026.patch...
 * Dropping 226_device-mapper-00027.patch...
 * Dropping 227_device-mapper-00028.patch...
 * Dropping 228_device-mapper-00029.patch...
 * Dropping 229_device-mapper-00030.patch...
 * Dropping 230_device-mapper-00031.patch...
 * Dropping 231_device-mapper-00032.patch...
 * Dropping 232_device-mapper-00033.patch...
 * Dropping 233_device-mapper-00034.patch...
 * Dropping 234_device-mapper-00035.patch...
 * Dropping 235_device-mapper-00036.patch...
 * Dropping 236_device-mapper-00037.patch...
 * Dropping 237_device-mapper-00038.patch...
 * Dropping 238_device-mapper-00039.patch...
 * Dropping 239_device-mapper-00040.patch...
 * Dropping 240_device-mapper-00041.patch...
 * Dropping 241_device-mapper-00042.patch...
 * Dropping 242_device-mapper-00043.patch...
 * Dropping 243_device-mapper-00044.patch...
 * Dropping 244_device-mapper-00045.patch...
 * Dropping 245_device-mapper-00046.patch...
 * Dropping 246_device-mapper-00047.patch...
 * Dropping 247_device-mapper-00048.patch...
 * Dropping 248_device-mapper-00049.patch...
 * Dropping 249_device-mapper-00050.patch...
 * Dropping 250_device-mapper-00051.patch...
 * Dropping 251_device-mapper-00052.patch...
 * Dropping 252_device-mapper-00053.patch...
 * Dropping 253_device-mapper-00054.patch...
 * Dropping 254_device-mapper-00055.patch...
 * Dropping 255_device-mapper-00056.patch...
 * Dropping 256_device-mapper-00057.patch...
 * Dropping 257_evms-1-dm-base...
 * Dropping 258_evms-2-syncio...
 * Dropping 259_evms-3-dm-bbr...
 * Dropping 260_evms-4-dm-sparse...
 * Dropping 261_evms-5-md.c...
 * Dropping 262_evms-6-vsprintf.c...
 * Dropping 263_evms-7-vfs-lock...
 * Dropping 264_linux-2.4-evms-2.0.0-to-2.0.1...
 * No Cryptographic support, dropping patches...
 * Dropping 600_usagi-linux24-s20030428-2.4.20...
 * Dropping 800_loop-jari-2.4.20...
 * Dropping 801_patch-int-2.4.20.1...
 * Dropping 802_superfreeswan-1.99.7rc2...
 * Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI
 * Dropping 6*...
Current kernel version is 2.4.20
Scanning patch directory: '.'
170 remaining:  000_o1_pe_ll_030412_ck_2.4.20: Good, applying... done!
169 remaining:  001_3.5G-address-space-5: Good, applying... done!
168 remaining:  002_aavm_030226_ck_2.4.20: Good, applying... done!
167 remaining:  003_rl2_021215_ck.2.4.20: Good, applying... done!
166 remaining:  004_supermount_030408_ck_2.4.20: Good, applying... done!
165 remaining:  005_acpi_030408_ck_2.4.20: Good, applying... done!
164 remaining:  006_TIOCGDEV: Good, applying... done!
163 remaining:  007_packet_030226_ck_2.4.20: Good, applying... done!
162 remaining:  008_VH_030409_ck_2.4.20: Good, applying... done!
161 remaining:  009_ST_030412_ck_2.4.20: Good, applying... done!
160 remaining:  010_DT_030426_ck_2.4.20: Good, applying... done!
159 remaining:  011_rmap15f_030412_ck_2.4.20.rmap: Good, applying... done!
158 remaining:  012_ea+acl+nfsacl-2.4.20-0.8.56.rmap: Good, applying... done!
157 remaining:  013_segfix-vm86: Good, applying... done!
156 remaining:  014_grsecurity-1.9.9g-2.4.20.rmap: Good, applying... done!
155 remaining:  015_Network_card_update: Good, applying... done!
154 remaining:  016_jfs-2.4.20-1.1.2: Good, applying... done!
153 remaining:  017_ntfs-2.1.4a.rmap: Good, applying... done!
152 remaining:  018_gcc31-compile-optimizations: Good, applying... done!
151 remaining:  019_dc395-integ24: Good, applying... done!
150 remaining:  020_kt400-agp-support: Good, applying... done!
149 remaining:  021_ecc-20030225: Good, applying... done!
148 remaining:  022_i2c-2.7.0: Good, applying... done!
147 remaining:  023_usbdnet_no_safe_serial-2.4.20: Good, applying... done!
146 remaining:  024_futexes-2.0.2: Good, applying... done!
145 remaining:  025_imon-0.0.2: Good, applying... done!
144 remaining:  026_proconfig_ptb-0.9.7: Good, applying... done!
143 remaining:  027_mdcount.patch: Good, applying... done!
142 remaining:  028_board_crash_fix: Good, applying... done!
141 remaining:  029_asus_3c59x_fix: Good, applying... done!
140 remaining:  030_in2000_ncr_scsi_fixes: Good, applying... done!
139 remaining:  031_starfire_nic_fix: Good, applying... done!
138 remaining:  032_bcm4400_bcm5700_nic: Good, applying... done!
137 remaining:  033_2.4.20-kraxel: Good, applying... done!
136 remaining:  034_mppe: Good, applying... done!
135 remaining:  035_dac960_root_fs_fix: Good, applying... done!
134 remaining:  036_sim710_fix: Good, applying... done!
133 remaining:  037_linux-2.4.20-nForce-IDE-Audio-0.4: Good, applying... done!
132 remaining:  038_intermezzo_fix: Good, applying... done!
131 remaining:  039_bluetooth-2.4.20-mh7: Good, applying... done!
130 remaining:  040_sk98lin_2.4.20: Good, applying... done!
129 remaining:  041_usb_scanner_04162003: Good, applying... done!
128 remaining:  042_imq-2.4.19: Good, applying... done!
127 remaining:  043_st_eot: Good, applying... done!
126 remaining:  044_devfs-snd-fix: Good, applying... done!
125 remaining:  045_sched-interrupt-fix: Good, applying... done!
124 remaining:  046_hpt372-updates: Good, applying... done!
123 remaining:  047_aic79xx-linux-2.4-20030501: Good, applying... done!
122 remaining:  048_aic79xx-linux-2.4-6.2.36: Good, applying... done!
121 remaining:  049_dc395_fix: Good, applying... done!
120 remaining:  100_evms-1.2.1: Good, applying... done!
119 remaining:  101_evms-common-1.2.1.rmap: Good, applying... done!
118 remaining:  102_evms-VFS-lock-1.2.1: Good, applying... done!
117 remaining:  300_sync_fs: Good, applying... done!
116 remaining:  301_sync_fs-fix: Good, applying... done!
115 remaining:  302_sync_fs-fix-2.patch: Good, applying... done!
114 remaining:  303_ext3-use-after-free: Good, applying... done!
113 remaining:  304_ext3-scheduling-storm: Good, applying... done!
112 remaining:  700_iptables-06_early_drop-backwards: Good, applying... done!
111 remaining:  701_iptables-20_iptables-proc: Good, applying... done!
110 remaining:  702_iptables-24_conntrack-nosysctl: Good, applying... done!
109 remaining:  703_iptables-25_natcore-nohelper: Good, applying... done!
108 remaining:  704_iptables-26_morethan32cpufix: Good, applying... done!
107 remaining:  705_iptables-27_include-nfc-order: Good, applying... done!
106 remaining:  706_iptables-IPV4OPTSSTRIP: Good, applying... done!
105 remaining:  707_iptables-NETLINK: Good, applying... done!
104 remaining:  708_iptables-NETMAP: Good, applying... done!
103 remaining:  709_iptables-SAME: Good, applying... done!
102 remaining:  710_iptables-TTL: Good, applying... done!
101 remaining:  711_iptables-condition: Good, applying... done!
100 remaining:  712_iptables-fuzzy: Good, applying... done!
99 remaining:   713_iptables-iprange: Good, applying... done!
98 remaining:   714_iptables-ipv4options: Good, applying... done!
97 remaining:   715_iptables-mport: Good, applying... done!
96 remaining:   716_iptables-nth: Good, applying... done!
95 remaining:   717_iptables-pool: Good, applying... done!
94 remaining:   718_iptables-psd: Good, applying... done!
93 remaining:   719_iptables-quota: Good, applying... done!
92 remaining:   720_iptables-random: Good, applying... done!
91 remaining:   721_iptables-realm: Good, applying... done!
90 remaining:   722_iptables-tcplimit: Good, applying... done!
89 remaining:   723_iptables-time: Good, applying... done!
88 remaining:   724_iptables-u32: Good, applying... done!
87 remaining:   725_iptables-CLASSIFY: Good, applying... done!
86 remaining:   726_iptables-CONNMARK: Good, applying... done!
85 remaining:   727_iptables-ROUTE: Good, applying... done!
84 remaining:   728_iptables-cuseeme-nat: Good, applying... done!
83 remaining:   729_iptables-eggdrop-conntrack: Good, applying... done!
82 remaining:   730_iptables-h323-conntrack-nat: Good, applying... done!
81 remaining:   731_iptables-ipt_TARPIT: Good, applying... done!
80 remaining:   732_iptables-mms-conntrack-nat: Good, applying... done!
79 remaining:   733_iptables-owner-socketlookup: Good, applying... done!
78 remaining:   734_iptables-pptp-conntrack-nat: Good, applying... done!
77 remaining:   735_iptables-quake3-conntrack: Good, applying... done!
76 remaining:   736_iptables-recent: Good, applying... done!
75 remaining:   737_iptables-rpc: Good, applying... done!
74 remaining:   738_iptables-rsh: Good, applying... done!
73 remaining:   739_iptables-string: Good, applying... done!
72 remaining:   740_iptables-talk-conntrack-nat: Good, applying... done!
71 remaining:   741_iptables-ip_conntrack_find: Good, applying... done!
70 remaining:   742_iptables-ip_ct_refresh_optimization: Good, applying... done!
69 remaining:   743_iptables-ip_ct_refresh_optimization_pptp: Good, applying...
done!
68 remaining:   744_iptables-03_ip_conntrack_proto_tcp-lockfix: Good, applying..
. done!
67 remaining:   745_iptables-04_newnat-udp-helper: Good, applying... done!
66 remaining:   746_iptables-05_REJECT-fwspotting-phrack60-fix: Good, applying..
. done!
65 remaining:   747_iptables-06_ftp-conntrack-msg-fix: Good, applying... done!
64 remaining:   748_iptables-07_ECN-tcpchecksum-littleendian-fix: Good, applying
... done!
63 remaining:   749_iptables-08_ftp-conntrack-debugftp: Good, applying... done!
62 remaining:   750_iptables-08_mangle_input_noroutemeharder: Good, applying...
done!
61 remaining:   751_iptables-09_icmp-match-all: Good, applying... done!
60 remaining:   752_iptables-10_confirm_fix: Good, applying... done!
59 remaining:   753_iptables-10_local-nat-expectfn: Good, applying... done!
58 remaining:   754_iptables-11_inner-icmp-translation-fix: Good, applying... do
ne!
57 remaining:   755_iptables-13_ftp-conntrack-epsv-typo: Good, applying... done!
56 remaining:   756_iptables-21_tftp-conntrack-nat: Good, applying... done!
55 remaining:   757_iptables-22_amanda-conntrack-nat: Good, applying... done!
54 remaining:   758_iptables-23_REJECT-headroom-tcprst: Good, applying... done!
53 remaining:   759_iptables-24_conntrack-modify-after-free-fix: Good, applying.
.. done!
52 remaining:   760_iptables-25_ip_tables-comment-fix: Good, applying... done!
51 remaining:   761_iptables-26_ipt_unclean-ubit: Good, applying... done!
50 remaining:   762_iptables-27_no_version: Good, applying... done!
49 remaining:   763_iptables-28_compat_code_removal: Good, applying... done!
48 remaining:   764_iptables-31_nat_parse_fix: Good, applying... done!
47 remaining:   765_iptables-32_reject-fixes: Good, applying... done!
46 remaining:   766_iptables-33_ipqueue_memoryleak: Good, applying... done!
45 remaining:   767_iptables-ipt_ULOG-mac_len-fix: Good, applying... done!
44 remaining:   768_iptables-ipt_multiport-invfix: Good, applying... done!
43 remaining:   769_iptables-unused_var: Good, applying... done!
42 remaining:   770_iptables-ip_conntrack-timeouts: Good, applying... done!
41 remaining:   771_iptables-netfilter-docbook: Good, applying... done!
40 remaining:   772_iptables-IMQ: Good, applying... done!
39 remaining:   773_iptables-HL.ipv6: Good, applying... done!
38 remaining:   774_iptables-REJECT.ipv6: Good, applying... done!
37 remaining:   775_iptables-condition6.ipv6: Good, applying... done!
36 remaining:   776_iptables-fuzzy6.ipv6: Good, applying... done!
35 remaining:   777_iptables-ip6_tables-proc.ipv6: Good, applying... done!
34 remaining:   778_iptables-ownercmd.ipv6: Good, applying... done!
33 remaining:   779_iptables-14_hl.ipv6: Good, applying... done!
32 remaining:   780_iptables-14_ip6t_ext_hdr.ipv6: Good, applying... done!
31 remaining:   781_iptables-15_ahesp6.ipv6: Good, applying... done!
30 remaining:   782_iptables-16_frag6.ipv6: Good, applying... done!
29 remaining:   783_iptables-17_ipv6header.ipv6: Good, applying... done!
28 remaining:   784_iptables-18_opts6.ipv6: Good, applying... done!
27 remaining:   785_iptables-19_route6.ipv6: Good, applying... done!
26 remaining:   786_iptables-29_mangle-bogus_cast.ipv6: Good, applying... done!
25 remaining:   787_iptables-30_ip6_route_me_harder.ipv6: Good, applying... done
!
24 remaining:   788_iptables-34_ip6queue_memoryleak.ipv6: Good, applying... done
!
23 remaining:   789_iptables-IMQ.ipv6: Good, applying... done!
22 remaining:   790_ipt-realm-config-require: Good, applying... done!
21 remaining:   791_gcc33-fixes: Good, applying... done!
20 remaining:   799_ipt-fix: Good, applying... done!
19 remaining:   900_quick-fixes: Good, applying... done!
18 remaining:   901_nfs_posix_acl_fix: Good, applying... done!
17 remaining:   902_minor_fixes: Good, applying... done!
16 remaining:   903_grsec_quick_fix.rmap: Good, applying... done!
15 remaining:   904_gracl.c_hardlink_fix_1.99g: Good, applying... done!
14 remaining:   905_jfs-1.1.2_fixes: Good, applying... done!
13 remaining:   906_realm_doc_fix: Good, applying... done!
12 remaining:   907_vesafb_fix: Good, applying... done!
11 remaining:   908_grsec_datasize_fix.patch: Good, applying... done!
10 remaining:   909_grsec_fix_disabled: Good, applying... done!
9 remaining:    991_fix_cryptoOrder: 2 out of 2 hunks FAILED -- saving rejects t
                                                        o file Makefile.rej
can't be applied.  Please modify the patch.

!!! ERROR: sys-kernel/gentoo-sources-2.4.20-r18 failed.
!!! Function src_unpack, Line 118, Exitcode 1
!!! Could not add patches!


Expected Results:  
No error

Portage 2.0.50-r8 (default-x86-1.4, gcc-3.3.2, glibc-2.3.2-r9, 2.4.20-gentoo-r9)
=================================================================
System uname: 2.4.20-gentoo-r9 i586 6x86L 2x Core/Bus Clock
Gentoo Base System version 1.4.16
Autoconf: sys-devel/autoconf-2.59-r3
Automake: sys-devel/automake-1.8.3
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-march=i586 -O2 -pipe"
CHOST="i586-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config
/usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-march=i586 -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs ccache sandbox"
GENTOO_MIRRORS="http://gentoo.oregonstate.edu
http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="foomaticdb gtk2 mad ncurses nls perl python readline ssl tcpd x86 zlib"
Comment 1 Tim Yamin (RETIRED) gentoo-dev 2004-06-20 05:41:41 UTC
Can I please have:

emerge -pv patch
emerge -pv '=gentoo-sources-2.4.20-r19'

Thanks.
Comment 2 Jean-Claude Repetto 2004-06-21 01:43:59 UTC
# emerge -pv patch
[ebuild   R   ] sys-devel/patch-2.5.9  -build -static  0 kB

# emerge -pv '=gentoo-sources-2.4.20-r19'
[ebuild  N    ] sys-kernel/gentoo-sources-2.4.20-r19  -aavm -build -build -crypt -evms2 -usagi  0 kB

I have the same problem with gentoo-sources-2.4.20-r19 :

9 remaining:    991_fix_cryptoOrder: 2 out of 2 hunks FAILED -- saving rejects to file Makefile.rej
can't be applied.  Please modify the patch.

!!! ERROR: sys-kernel/gentoo-sources-2.4.20-r19 failed.
Comment 3 Tim Yamin (RETIRED) gentoo-dev 2004-06-21 13:23:17 UTC
Created attachment 33768 [details, diff]
Patch

Can you please apply this patch to the ebuild and tell me if it works?
Thanks...
Comment 4 Jean-Claude Repetto 2004-06-22 07:07:37 UTC
Your patch is working, no more errors.
Thanks !

Jean-Claude