X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@lists.alpinelinux.org Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by lists.alpinelinux.org (Postfix) with ESMTP id 396141EBFF1 for ; Tue, 4 Jan 2011 13:08:18 +0000 (UTC) Received: by bwz12 with SMTP id 12so7096989bwz.13 for ; Tue, 04 Jan 2011 05:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:in-reply-to :references:from:date:message-id:subject:to:cc:content-type; bh=Hrrv/+ED1Y+8N4FxRxEMgy78WLXWmFmOvkhI79gebvM=; b=JOz/y+k3rxo/3S0dP9//WmT42ywMuDJQOgHNloaPXXBOvDythysUUUM+Ek44kVIfJi zEQ7sMGTPNgMwm8nyeNI3pyK9lKGXf8IbkCfdYL+FrhqbBk+knGbSzeRUvyW+Z+mXei9 CBMYGu7ursbV+FncCuDTv7MEjnBarYQuyJF6w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=FdInLuARt1gmjEyHYVBVRvOsNo52qxhcYLxxzV77AvyQKVDDNDnnA3ZLmIdufDw46c 4fs1JuKPtVKEW3YZyVKRthrpFi1aMFtxOQ/Zrml1fmnIcUGMZnLHrAr695ZOArW5TMAk 1d0vzIlhVd5d1UywBrHtzevvYLPfVc4BETa0g= Received: by 10.204.52.138 with SMTP id i10mr6351197bkg.23.1294146497381; Tue, 04 Jan 2011 05:08:17 -0800 (PST) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 10.204.75.195 with HTTP; Tue, 4 Jan 2011 05:07:57 -0800 (PST) In-Reply-To: <20110104131555.16e1461f@ncopa-desktop.nor.wtbts.net> References: <20110104131555.16e1461f@ncopa-desktop.nor.wtbts.net> From: Francesco Date: Tue, 4 Jan 2011 14:07:57 +0100 Message-ID: Subject: Re: [alpine-devel] patch: fixed init script for rp-pppoe To: Natanael Copa Cc: alpine-devel@lists.alpinelinux.org Content-Type: multipart/mixed; boundary=00504502d919438556049904f692 --00504502d919438556049904f692 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Ok, this should work. Thanks! :: Francesco Colista :: Email : francesco.colista@gmail.com :: Jabber: francesco@jabber.org 2011/1/4 Natanael Copa : > On Tue, 4 Jan 2011 09:53:11 +0100 > Francesco wrote: > >> Now, rp-pppoe uses runscript instead of /bin/sh >> >> Plase review and commit. > > error: testing/rp-pppoe/APKBUILD: already exists in index > error: testing/rp-pppoe/rp-pppoe.initd: already exists in index > Patch failed at 0001 rp-pppoe init now use runscript > > Can you please rebase it against current git master and resend it? > > Something like: > > git checkout master > git pull --rebase > cd testing/rp-pppoe > # edit files > git add . > git commit =C2=A0# use 'testing/rp-pppoe: use runscript' as first line in > commit message. > > Then: > git send-email --to alpine-devel@lists.alpinelinux.org HEAD^ > > Thanks! > -nc > --00504502d919438556049904f692 Content-Type: text/x-diff; charset=US-ASCII; name="0001-testing-rp-pppoe-use-runscript-as-first-line-in.patch" Content-Disposition: attachment; filename="0001-testing-rp-pppoe-use-runscript-as-first-line-in.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_giitfp2a0 RnJvbSA1YmViZGY5NGJhOTQyNjI0NzY4YjAxNzg2NmRmMGYxOTZkNDU1MDI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmFuY2VzY28gQ29saXN0YSA8ZnJhbmNlc2NvLmNvbGlzdGFA Z21haWwuY29tPgpEYXRlOiBUdWUsIDQgSmFuIDIwMTEgMTM6MDU6NDcgKzAwMDAKU3ViamVjdDog W1BBVENIXSB0ZXN0aW5nL3JwLXBwcG9lOiB1c2UgcnVuc2NyaXB0JyBhcyBmaXJzdCBsaW5lIGlu CgotLS0KIHRlc3RpbmcvcnAtcHBwb2UvQVBLQlVJTEQgICAgICAgfCAgICAyICstCiB0ZXN0aW5n L3JwLXBwcG9lL3JwLXBwcG9lLmluaXRkIHwgICA1NyArKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAzNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0aW5nL3JwLXBwcG9lL0FQS0JVSUxEIGIvdGVzdGlu Zy9ycC1wcHBvZS9BUEtCVUlMRAppbmRleCA0MDg5M2RhLi40MDNmNjk3IDEwMDY0NAotLS0gYS90 ZXN0aW5nL3JwLXBwcG9lL0FQS0JVSUxECisrKyBiL3Rlc3RpbmcvcnAtcHBwb2UvQVBLQlVJTEQK QEAgLTIsNyArMiw3IEBACiAjIE1haW50YWluZXI6IEZyYW5jZXNjbyBDb2xpc3RhIDxmcmFuY2Vz Y28uY29saXN0YUBnbWFpbC5jb20+CiBwa2duYW1lPXJwLXBwcG9lCiBwa2d2ZXI9My4xMAotcGtn cmVsPTEKK3BrZ3JlbD0yCiBwa2dkZXNjPSJSb2FyaW5nIFBlbmd1aW5cJ3MgUG9pbnQtdG8tUG9p bnQgUHJvdG9jb2wgb3ZlciBFdGhlcm5ldCBjbGllbnQiCiB1cmw9Imh0dHA6Ly93d3cucm9hcmlu Z3Blbmd1aW4uY29tL3BwcG9lLyIKIGFyY2g9Ing4NiB4ODZfNjQiCmRpZmYgLS1naXQgYS90ZXN0 aW5nL3JwLXBwcG9lL3JwLXBwcG9lLmluaXRkIGIvdGVzdGluZy9ycC1wcHBvZS9ycC1wcHBvZS5p bml0ZAppbmRleCA3YzViZGY2Li4zZTZjZTNlIDEwMDY0NAotLS0gYS90ZXN0aW5nL3JwLXBwcG9l L3JwLXBwcG9lLmluaXRkCisrKyBiL3Rlc3RpbmcvcnAtcHBwb2UvcnAtcHBwb2UuaW5pdGQKQEAg LTEsNDEgKzEsMzAgQEAKLSMhL2Jpbi9zaAotIworIyEvc2Jpbi9ydW5zY3JpcHQKIAotUEFUSD0v dXNyL2xvY2FsL3NiaW46L3Vzci9sb2NhbC9iaW46L3NiaW46L2JpbjovdXNyL3NiaW46L3Vzci9i aW4KLURBRU1PTj0vdXNyL3NiaW4vcHBwb2Utc2VydmVyCi1OQU1FPXBwcG9lLXNlcnZlcgorZGVw ZW5kKCkgeworCW5lZWQgbmV0Cit9CiAKLSMgU2V0dXAgc2VydmVyIGFuZCBzZXJ2aWNlIG5hbWVz LCBTZXJ2ZXIgcGVlciBJUCwgc3RhcnQgb2YgSVAgcmFuZ2UgZm9yIGNsaWVudHMgcGVlcnMsIGFt b3VudCBvZiBwZWVycyBhdCBzYW1lIHRpbWUKLVBBUkFNUz0iLUMgWEdUMDEgLVMgUFBQb0VDIC1M IDE3Mi4xOS4ke0JSTlVNfS4yIC1SIDE3Mi4xOS4ke0JSTlVNfS4xMDAgLU4gMTAwIgorc3RhcnQo KSB7CisJZWJlZ2luICJTdGFydGluZyBQUFBPRSBTZXJ2ZXIiCisJdGVzdCAteCAvdXNyL3NiaW4v cHBwb2Utc2VydmVyIC1hIC1mIC9ldGMvcHBwL3BwcG9lLXNlcnZlci1vcHRpb25zIHx8IGV4aXQg MAorCXN0YXJ0LXN0b3AtZGFlbW9uIC0tc3RhcnQgLS1leGVjIC91c3Ivc2Jpbi9wcHBvZS1zZXJ2 ZXIgLS0gJHtQUFBPRV9QQVJBTVN9CisJZWNobyAxID4gL3Byb2Mvc3lzL25ldC9pcHY0L2lwX2Zv cndhcmQKKwllZW5kICQ/Cit9CiAKLXRlc3QgLXggL3Vzci9zYmluL3BwcG9lLXNlcnZlciAtYSAt ZiAvZXRjL3BwcC9wcHBvZS1zZXJ2ZXItb3B0aW9ucyB8fCBleGl0IDAKK3N0b3AgKCkgeworCWVi ZWdpbiAiU3RvcHBpbmcgUFBQT0UgU2VydmVyIgorCXN0YXJ0LXN0b3AtZGFlbW9uIC0tc3RvcCAt LWV4ZWMgL3Vzci9zYmluL3BwcG9lLXNlcnZlcgorCWVjaG8gMCA+IC9wcm9jL3N5cy9uZXQvaXB2 NC9pcF9mb3J3YXJkCisJZWVuZCAkPworfQogCi1jYXNlICIkMSIgaW4KLSAgICBzdGFydCkKLSAg ICAgICAgZWNobyAtbiAiU3RhcnRpbmcgdXAgJE5BTUUgIgotICAgICAgICBzdGFydC1zdG9wLWRh ZW1vbiAtLXN0YXJ0IC0tcXVpZXQgLS1waWRmaWxlIC92YXIvcnVuLyROQU1FLyROQU1FLnBpZCAt LWV4ZWMgJERBRU1PTiAtLSAkUEFSQU1TCi0gICAgICAgIGVjaG8gMSA+IC9wcm9jL3N5cy9uZXQv aXB2NC9pcF9mb3J3YXJkCi0gICAgICAgIGVjaG8gIi4iCi0gICAgICAgIDs7Ci0gICAgc3RvcCkK LSAgICAgICAgZWNobyAtbiAiU2h1dHRpbmcgZG93biAkTkFNRSAiCi0gICAgICAgIHN0YXJ0LXN0 b3AtZGFlbW9uIC0tc3RvcCAtLXF1aWV0IC0tcGlkZmlsZSAvdmFyL3J1bi8kTkFNRS8kTkFNRS5w aWQgLS1leGVjICREQUVNT04KLSAgICAgICAgZWNobyAwID4gL3Byb2Mvc3lzL25ldC9pcHY0L2lw X2ZvcndhcmQKLSAgICAgICAga2lsbGFsbCAkREFFTU9OID4gL2Rldi9udWxsIDI+JjEKLSAgICAg ICAgZWNobyAiLiIKLSAgICAgICAgOzsKLSAgICByZXN0YXJ0fGZvcmNlLXJlbG9hZCkKLSAgICAg ICAgZWNobyAtbiAiUmVzdGFydGluZyAkTkFNRSAiCi0gICAgICAgIHN0YXJ0LXN0b3AtZGFlbW9u IC0tc3RvcCAtLXF1aWV0IC0tcGlkZmlsZSAvdmFyL3J1bi8kTkFNRS8kTkFNRS5waWQgLS1leGVj ICREQUVNT04KK3Jlc3RhcnQgKCkgeworICAgICAgICBlYmVnaW4gIlJlc3RhcnRpbmcgUFBQT0Ug U2VydmVyIgorICAgICAgICBzdGFydC1zdG9wLWRhZW1vbiAtLXN0b3AgLS1leGVjIC91c3Ivc2Jp bi9wcHBvZS1zZXJ2ZXIKICAgICAgICAgc2xlZXAgMQotICAgICAgICBzdGFydC1zdG9wLWRhZW1v biAtLXN0YXJ0IC0tcXVpZXQgLS1waWRmaWxlIC92YXIvcnVuLyROQU1FLyROQU1FLnBpZCAtLWV4 ZWMgJERBRU1PTiAtLSAkUEFSQU1TCisgICAgICAgIHN0YXJ0LXN0b3AtZGFlbW9uIC0tc3RhcnQg LS1leGVjIC91c3Ivc2Jpbi9wcHBvZS1zZXJ2ZXIgLS0gJHtQUFBPRV9QQVJBTVN9CisgICAgICAg IGVjaG8gMSA+IC9wcm9jL3N5cy9uZXQvaXB2NC9pcF9mb3J3YXJkCiAgICAgICAgIGVjaG8gIi4i Ci0gICAgICAgIDs7Ci0gICAgKikKLSAgICAgICAgZWNobyAiVXNhZ2U6IC9ldGMvaW5pdC5kLyRO QU1FIHtzdGFydHxzdG9wfHJlc3RhcnR8Zm9yY2UtcmVsb2FkfSIKLSAgICAgICAgZXhpdCAxCi0g ICAgICAgIDs7Ci1lc2FjCi0KLWV4aXQgMAorfQogCi0tIAoxLjcuMy4yCgo= --00504502d919438556049904f692-- --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---