diff options
Diffstat (limited to 'zarb-ml/mageia-dev/2011-October/009031.html')
| -rw-r--r-- | zarb-ml/mageia-dev/2011-October/009031.html | 365 |
1 files changed, 365 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2011-October/009031.html b/zarb-ml/mageia-dev/2011-October/009031.html new file mode 100644 index 000000000..e5de5b7c9 --- /dev/null +++ b/zarb-ml/mageia-dev/2011-October/009031.html @@ -0,0 +1,365 @@ +<!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=%3C4EA13C4F.5050802%40colin.guthr.ie%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="009039.html"> + <LINK REL="Next" HREF="009045.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.</H1> + <B>Colin Guthrie</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=%3C4EA13C4F.5050802%40colin.guthr.ie%3E" + TITLE="[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.">mageia at colin.guthr.ie + </A><BR> + <I>Fri Oct 21 11:33:03 CEST 2011</I> + <P><UL> + <LI>Previous message: <A HREF="009039.html">[Mageia-dev] [changelog] [RPM] cauldron core/release pingus-0.7.4-1.mga2 +</A></li> + <LI>Next message: <A HREF="009045.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#9031">[ date ]</a> + <a href="thread.html#9031">[ thread ]</a> + <a href="subject.html#9031">[ subject ]</a> + <a href="author.html#9031">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Hi, + +Just to try and keep our initscripts package vaguely manageable, I've +been playing with git repositories. + +The upstream RedHat sources are managed in git[1] and thus it should be +easier to migrate our patches when new versions come out. + +In order to get some sense of what we, Mageia, have changed from the mdv +version we imported, I first imported the Mandriva SVN repository into +git via git-svn[2] + +Using that git repository, I was able to find two specific commits +relating to the 9.21 version that we are currently using. These two +revisions related to the upstream 9.21 vendor branch drop into the mdv svn: + +commit a108114a04f1b3b7878af695565b349c8f340d96 +Author: bor <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">bor at 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94</A>> +Date: Sat Nov 27 17:19:55 2010 +0000 + + Load initscripts-9.21 into initscripts/branches/RedHat. + + +and the merge of said initscripts into the Mandriva modified branch: + +commit 16def7de45bfe471abb646142f6ce35cf1d0b2f0 +Author: bor <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">bor at 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94</A>> +Date: Sat Nov 27 18:57:54 2010 +0000 + + merge in initscripts-9.21 + + git-svn-id: +<A HREF="http://svn.mandriva.com/svn/soft/initscripts/trunk@271362">http://svn.mandriva.com/svn/soft/initscripts/trunk@271362</A> +99302b65-d5f7-0310-b3dd-f8cd6f4e3d94 + + + + +In theory, the differences between these two commits is what should make +up the "initscripts-mdvconf.patch" (the monster patch that adds all of +Mandriva's modifications). + +So by creating a new branch (mga-9.21-patch-drop) of of the first commit +(a108114) and applying our current version of the +initscripts-mdvconf.patch (with some manual tweaks due to the +replacement of the po folder with a symlink which "patch" didn't really +like working with), I ended up with: + +commit c2d4ed5e9c953f4a6da28d772532c60c8c910fe2 +Author: Colin Guthrie <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">colin at mageia.org</A>> +Date: Mon Oct 17 20:57:16 2011 +0100 + + Apply Mageia initscripts patch. + + + +I could then compare (git diff 16def7..c2d4ed) the two versions. Apart +from the massive ChangeLog present in the mdv branch, the differences +were actually quite small, so I extracted these separately to a +temporary patch which I kept for later. + + + + +Then, I took, a fresh clone of the upstream fedora initscripts git +repository (which I've ultimately pushed to [3]). From now on any +references and sha1 will refer to this repository (the svn imported one +is no longer used). + +I then created a branch from the upstream 9.25 commit: + + +commit 4688ea25c9a5a87e48f89fc91a3c93a7c8c95b4a +Author: Bill Nottingham <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">notting at redhat.com</A>> +Date: Fri Feb 25 15:15:29 2011 -0500 + + Update to 9.25-1 + + +and applied the current version of the initscripts-mdkconf.patch from +Mandriva's SVN repository which had been updated to initscripts 9.25. + +I saved this to a new branch called mga-9.21-mdkconf which resulted in: + +commit be75c98a06d569fbaa2d86f92676af961795d094 +Author: Colin Guthrie <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">colin at mageia.org</A>> +Date: Fri Oct 21 01:28:48 2011 +0100 + + Add the mdkconf patch + + + + +I then created a new branch from this called mga-9.25-branding and +reapplied the small differences we'd made to the 9.21 version of the +mdkconf patch which I saved above. I made a couple extra further changes +on top of that: + +commit 29aae08c5860326975c91834ee9aa9560b4ef7da +Author: Colin Guthrie <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">colin at mageia.org</A>> +Date: Mon Oct 17 21:38:04 2011 +0100 + + Apply Mageia branding patch + +commit 43858a6b877a6ca5e947dda16ffc11351c3a811f +Author: Colin Guthrie <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">colin at mageia.org</A>> +Date: Mon Oct 17 21:41:32 2011 +0100 + + A few more Mageia branding changes. + + + + +Then I created yet another branch called mga-9.25-patches, and applied +any additional patches from the current SPEC file that were not yet applied. + +This resulted in the followed commits: + + +commit 27994d6d04def1cb1ec9e0cc591e397eede74373 +Author: Colin Guthrie <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">colin at mageia.org</A>> +Date: Mon Oct 17 21:45:41 2011 +0100 + + Remove trailing slash in TMP/TMPDIR. + + When building gcc/ecj1, TMP/TMPDIR is used and this results in debugedit + being unhappy. + + (patch originally from svn: 77112 rtp - Remove trailing whitespace +at the end of TMPDIR/TMP) + +commit 0068234306f56d9c339a0f3c395516d04635cfb8 +Author: anssi <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">anssi at 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94</A>> +Date: Sun Apr 17 11:31:24 2011 +0000 + + rc.sysinit: Do not use speedboot if display_driver_helper says so +(reasons include queued dkms update later in the boot or a conflicting +driver loaded by initrd, in which case the user is asked to reboot by +harddrake later). This has no effect under systemd. + + git-svn-id: +svn+<A HREF="ssh://svn.mandriva.com/svn/soft/initscripts/trunk@272301">ssh://svn.mandriva.com/svn/soft/initscripts/trunk@272301</A> +99302b65-d5f7-0310-b3dd-f8cd6f4e3d94 + +commit d6df24da00ad9283e26b0ae7bda65c00f4f750cd +Author: Thomas Backlund <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">tmb at mageia.org</A>> +Date: Mon Oct 17 21:54:48 2011 +0100 + + Replace LANG with LC_ALL + + <A HREF="https://bugs.mageia.org/show_bug.cgi?id=1216">https://bugs.mageia.org/show_bug.cgi?id=1216</A> + +commit 448ff89ce545b3ad6ceb83c99fa2f0037b9b97db +Author: Jari <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">lihamakaroonilaatikko at gmail.com</A>> +Date: Mon May 23 11:44:05 2011 +0000 + + Fix password prompt for encrypted partitions + + Bug #1290 + +commit 5d2b37c21bd6e674969b5b0fa742fb175dde7499 +Author: Jari <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">lihamakaroonilaatikko at gmail.com</A>> +Date: Mon May 23 11:46:51 2011 +0000 + + Limit the number of tries to unlock + + Bug #1290 + +commit d34d3fe37f4f2702bf1c58c94704c8a061681010 +Author: Olivier Blin <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">mageia at blino.org</A>> +Date: Sat May 28 13:52:38 2011 +0200 + + run chvt with --userwait option at shutdown to avoid hanging waiting +for chvt 1, since dm stop might have triggered a vt change as well +details from vuntz on +<A HREF="https://bugzilla.novell.com/show_bug.cgi?id=540482#c115">https://bugzilla.novell.com/show_bug.cgi?id=540482#c115</A> (happens on my +laptop with Mobility Radeon 9600 M10, plymouth disabled) + + + + +So with these three branches in place I was able to do the following: + + +$ git diff initscripts-9.25-1..mga-9.25-mdkconf >initscripts-mdkconf.patch + +This regenerated a suitable monster patch. + +$ git format-patch --start-number 100 mga-9.25-mdkconf..mga-9.25-branding + +This resulted in the following patches: + +0100-Apply-Mageia-branding-patch.patch +0101-A-few-more-Mageia-branding-changes.patch + +and finally: + +$ git format-patch --start-number 200 mga-9.25-branding..mga-9.25-patches + +which resulted in the following patches: + +0200-Remove-trailing-slash-in-TMP-TMPDIR.patch +0201-rc.sysinit-Do-not-use-speedboot-if-display_driver_he.patch +0202-Replace-LANG-with-LC_ALL.patch +0203-Fix-password-prompt-for-encrypted-partitions.patch +0204-Limit-the-number-of-tries-to-unlock.patch +0205-run-chvt-with-userwait-option-at-shutdown-to-avoid-h.patch + + + + +These files then made up the new initscripts spec file (not yet +committed to svn). + + + +Phew! Just wanted to document the process to make sure I've not done +anything dumb/stupid. We can of course roll up all the small patches, +branding, etc. into the mdkconf branch and just generate one monster +patch in the future, but I wanted to have clear separation at least +initially. + +If people want to double check this work, it would be much appreciated. + + +Hope that's all clear. + + +Col + + +1. <A HREF="git://git.fedorahosted.org/initscripts.git">git://git.fedorahosted.org/initscripts.git</A> +2. <A HREF="git://git.mageia.org/initscripts-mdv">git://git.mageia.org/initscripts-mdv</A> +3. <A HREF="git://git.mageia.org/initscripts">git://git.mageia.org/initscripts</A> + +I recommend adding the following to your ~/.gitconfig: + + +[url "<A HREF="git://git.mageia.org/">git://git.mageia.org/</A>"] + insteadof = mga: +[url "<A HREF="ssh://git.mageia.org/git/">ssh://git.mageia.org/git/</A>"] + pushInsteadof = mga: + + +This way you can do: "git clone mga:initscripts" or "git clone +mga:initscripts-mdv". Cloning will use the (lower overhead) git +protocol, whereas push will use SSH (provided you have SSH commit rights +of course). + + + +-- + +Colin Guthrie +colin(at)mageia.org +<A HREF="http://colin.guthr.ie/">http://colin.guthr.ie/</A> + +Day Job: + Tribalogic Limited <A HREF="http://www.tribalogic.net/">http://www.tribalogic.net/</A> +Open Source: + Mageia Contributor <A HREF="http://www.mageia.org/">http://www.mageia.org/</A> + PulseAudio Hacker <A HREF="http://www.pulseaudio.org/">http://www.pulseaudio.org/</A> + Trac Hacker <A HREF="http://trac.edgewall.org/">http://trac.edgewall.org/</A> +</PRE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="009039.html">[Mageia-dev] [changelog] [RPM] cauldron core/release pingus-0.7.4-1.mga2 +</A></li> + <LI>Next message: <A HREF="009045.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#9031">[ date ]</a> + <a href="thread.html#9031">[ thread ]</a> + <a href="subject.html#9031">[ subject ]</a> + <a href="author.html#9031">[ 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> |