From: Pavel Solntsev <p_solntsev_devel@meta.ua> To: ALT Linux Team development discussions <devel@lists.altlinux.org> Subject: [devel] git Howto Date: Thu, 11 Jun 2009 12:24:41 +0300 Message-ID: <4A30CD59.9010702@meta.ua> (raw) Изучаю git. Задача: научится создавать рабочие патчи. имеем: branch 5.0 $ mkdir molden && cd molden $ git init-db $ cp ....../molden-4.7.tar.gz . $ tar zxvf molden-4.7.tar.gz $ mv molden-4.7 moden $ cp ....../molden.spec . $ mkdir .gear $ echo "tar.gz: moden" > .gear/rules $ git add . $ git commit -a -m "First build for git. Small bug fix" $ vim molden/xwin.c (правим: заменяем linkat на linkat_new) $ rm -f molden/xwin.c~ $ git commit -a -m "Edit xwin.c file" $ git diff > olden-glibc-2.10.patch # git diff -p тоже использовался $ git add olden-glibc-2.10.patch $ echo "copy: *.patch" >> .gear/rules $ gear --rpmbuild -- rpm -ba Выполняется(%prep): /bin/sh -e /home/group/RPM/tmp/rpm-tmp.46848 + umask 022 + /bin/mkdir -p /home/group/RPM/BUILD + cd /home/group/RPM/BUILD + cd /home/group/RPM/BUILD + rm -rf molden-4.7 + echo 'Source #0 (molden-4.7.tar.gz):' Source #0 (molden-4.7.tar.gz): + /bin/gzip -dc /home/group/tmp/gear.673MXzhj/out/molden-4.7.tar.gz + /bin/tar -xf - + cd molden-4.7 + /bin/chmod -c -Rf u+rwX,go-w . + echo 'Patch #0 (molden-glibc-2.10.patch):' Patch #0 (molden-glibc-2.10.patch): + /usr/bin/patch -p1 can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/molden/xwin.c b/molden/xwin.c |index 9333498..706c109 100644 |--- a/molden/xwin.c |+++ b/molden/xwin.c -------------------------- File to patch: И все. в спеке ... Patch0: %name-glibc-2.10.patch ... %patch -p1 ...
next reply other threads:[~2009-06-11 9:24 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-06-11 9:24 Pavel Solntsev [this message] 2009-06-11 9:27 ` Andrey Rahmatullin 2009-06-11 9:27 ` Slava Semushin 2009-06-11 9:46 ` REAL 2009-06-11 9:38 ` Andrey Rahmatullin 2009-06-11 9:44 ` REAL 2009-06-11 9:37 ` Andrey Rahmatullin 2009-06-11 9:44 ` Pavel Solntsev
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4A30CD59.9010702@meta.ua \ --to=p_solntsev_devel@meta.ua \ --cc=devel@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux Team development discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \ devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru public-inbox-index devel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git