summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-dev/2011-October/009045.html
diff options
context:
space:
mode:
Diffstat (limited to 'zarb-ml/mageia-dev/2011-October/009045.html')
-rw-r--r--zarb-ml/mageia-dev/2011-October/009045.html163
1 files changed, 163 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2011-October/009045.html b/zarb-ml/mageia-dev/2011-October/009045.html
new file mode 100644
index 000000000..a3ea5f430
--- /dev/null
+++ b/zarb-ml/mageia-dev/2011-October/009045.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ <HEAD>
+ <TITLE> [Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.
+ </TITLE>
+ <LINK REL="Index" HREF="index.html" >
+ <LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Initscripts%20-%20Migrating%20to%20git%20and%20regenerating%0A%20mdkconf.patch%20and%20further%20Mageia%20tweaks.&In-Reply-To=%3C4EA23EE6.6020001%40iki.fi%3E">
+ <META NAME="robots" CONTENT="index,nofollow">
+ <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
+ <LINK REL="Previous" HREF="009031.html">
+ <LINK REL="Next" HREF="009056.html">
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+ <H1>[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.</H1>
+ <B>Anssi Hannula</B>
+ <A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Initscripts%20-%20Migrating%20to%20git%20and%20regenerating%0A%20mdkconf.patch%20and%20further%20Mageia%20tweaks.&In-Reply-To=%3C4EA23EE6.6020001%40iki.fi%3E"
+ TITLE="[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.">anssi.hannula at iki.fi
+ </A><BR>
+ <I>Sat Oct 22 05:56:22 CEST 2011</I>
+ <P><UL>
+ <LI>Previous message: <A HREF="009031.html">[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.
+</A></li>
+ <LI>Next message: <A HREF="009056.html">[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#9045">[ date ]</a>
+ <a href="thread.html#9045">[ thread ]</a>
+ <a href="subject.html#9045">[ subject ]</a>
+ <a href="author.html#9045">[ author ]</a>
+ </LI>
+ </UL>
+ <HR>
+<!--beginarticle-->
+<PRE>On 21.10.2011 12:33, Colin Guthrie wrote:
+&gt;<i> Hi,
+</I>
+Hi!
+
+[...]
+&gt;<i> Then I created yet another branch called mga-9.25-patches, and applied
+</I>&gt;<i> any additional patches from the current SPEC file that were not yet applied.
+</I>&gt;<i>
+</I>&gt;<i> This resulted in the followed commits:
+</I>[...]
+&gt;<i> commit 0068234306f56d9c339a0f3c395516d04635cfb8
+</I>&gt;<i> Author: anssi &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">anssi at 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94</A>&gt;
+</I>&gt;<i> Date: Sun Apr 17 11:31:24 2011 +0000
+</I>&gt;<i>
+</I>&gt;<i> rc.sysinit: Do not use speedboot if display_driver_helper says so
+</I>&gt;<i> (reasons include queued dkms update later in the boot or a conflicting
+</I>&gt;<i> driver loaded by initrd, in which case the user is asked to reboot by
+</I>&gt;<i> harddrake later). This has no effect under systemd.
+</I>&gt;<i>
+</I>&gt;<i> git-svn-id:
+</I>&gt;<i> svn+<A HREF="ssh://svn.mandriva.com/svn/soft/initscripts/trunk@272301">ssh://svn.mandriva.com/svn/soft/initscripts/trunk@272301</A>
+</I>&gt;<i> 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94
+</I>
+This was already applied in mdv, you've double-applied it :)
+
+[...]
+&gt;<i> commit 448ff89ce545b3ad6ceb83c99fa2f0037b9b97db
+</I>&gt;<i> Author: Jari &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">lihamakaroonilaatikko at gmail.com</A>&gt;
+</I>[...]
+
+Off-topic, but FYI
+lihamakaronilaatikko = meat macaroni casserole ;)
+
+[...]
+&gt;<i> Phew! Just wanted to document the process to make sure I've not done
+</I>&gt;<i> anything dumb/stupid. We can of course roll up all the small patches,
+</I>&gt;<i> branding, etc. into the mdkconf branch and just generate one monster
+</I>&gt;<i> patch in the future, but I wanted to have clear separation at least
+</I>&gt;<i> initially.
+</I>&gt;<i>
+</I>&gt;<i> If people want to double check this work, it would be much appreciated.
+</I>&gt;<i>
+</I>&gt;<i> Hope that's all clear.
+</I>
+Looks ok and nice :)
+
+&gt;<i>
+</I>&gt;<i> 1. <A HREF="git://git.fedorahosted.org/initscripts.git">git://git.fedorahosted.org/initscripts.git</A>
+</I>&gt;<i> 2. <A HREF="git://git.mageia.org/initscripts-mdv">git://git.mageia.org/initscripts-mdv</A>
+</I>&gt;<i> 3. <A HREF="git://git.mageia.org/initscripts">git://git.mageia.org/initscripts</A>
+</I>&gt;<i>
+</I>&gt;<i> I recommend adding the following to your ~/.gitconfig:
+</I>&gt;<i>
+</I>&gt;<i>
+</I>&gt;<i> [url &quot;<A HREF="git://git.mageia.org/">git://git.mageia.org/</A>&quot;]
+</I>&gt;<i> insteadof = mga:
+</I>&gt;<i> [url &quot;<A HREF="ssh://git.mageia.org/git/">ssh://git.mageia.org/git/</A>&quot;]
+</I>&gt;<i> pushInsteadof = mga:
+</I>&gt;<i>
+</I>&gt;<i>
+</I>&gt;<i> This way you can do: &quot;git clone mga:initscripts&quot; or &quot;git clone
+</I>&gt;<i> mga:initscripts-mdv&quot;. Cloning will use the (lower overhead) git
+</I>&gt;<i> protocol, whereas push will use SSH (provided you have SSH commit rights
+</I>&gt;<i> of course).
+</I>
+Thanks for the tip :)
+
+
+--
+Anssi Hannula
+</PRE>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--endarticle-->
+ <HR>
+ <P><UL>
+ <!--threads-->
+ <LI>Previous message: <A HREF="009031.html">[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.
+</A></li>
+ <LI>Next message: <A HREF="009056.html">[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#9045">[ date ]</a>
+ <a href="thread.html#9045">[ thread ]</a>
+ <a href="subject.html#9045">[ subject ]</a>
+ <a href="author.html#9045">[ author ]</a>
+ </LI>
+ </UL>
+
+<hr>
+<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
+mailing list</a><br>
+</body></html>