[Mageia-dev] Initscripts - Migrating to git and regenerating mdkconf.patch and further Mageia tweaks.

[Anssi Hannula]

On 21.10.2011 12:33, Colin Guthrie wrote:
> Hi,

Hi!

[...]
> 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 0068234306f56d9c339a0f3c395516d04635cfb8
> Author: anssi <anssi at 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
> 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+ssh://svn.mandriva.com/svn/soft/initscripts/trunk@272301
> 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94

This was already applied in mdv, you've double-applied it :)

[...]
> commit 448ff89ce545b3ad6ceb83c99fa2f0037b9b97db
> Author: Jari <lihamakaroonilaatikko at gmail.com>
[...]

Off-topic, but FYI
lihamakaronilaatikko = meat macaroni casserole ;)

[...]
> 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.

Looks ok and nice :)

> 
> 1. git://git.fedorahosted.org/initscripts.git
> 2. git://git.mageia.org/initscripts-mdv
> 3. git://git.mageia.org/initscripts
> 
> I recommend adding the following to your ~/.gitconfig:
> 
> 
> [url "git://git.mageia.org/"]
>         insteadof = mga:
> [url "ssh://git.mageia.org/git/"]
>         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).

Thanks for the tip :)


-- 
Anssi Hannula