Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (a52e45fd8da7de5fb920a8a1df63dae427505445)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: flux <flux AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (a52e45fd8da7de5fb920a8a1df63dae427505445)
  • Date: Tue, 5 Aug 2008 20:04:44 -0400

Eric Sandall (eric AT sandall.us) wrote [08.08.05 12:59]:
> > > > -./configure --prefix=${INSTALL_ROOT}/usr \
> > > > - --qemu-cflags="${CFLAGS}" \
> > > > - --qemu-ldflags="${LDFLAGS}" \
> > > > +./configure --prefix=${INSTALL_ROOT}/usr \
> > > > + --qemu-cflags="${CFLAGS}" \
> > > > + --qemu-ldflags="${LDFLAGS}" \
> > > > --kerneldir="/lib/modules/$(get_kernel_version)/build" \
> > > > - --disable-werror &&
> > > > -make
> > > > + --disable-werror
> > > > && +make
> You both are only seeing the diff between what you guys already had, and
> the changes I did based on that. I reverted his OPTS cleanup and update
> to 72 because that was broken (if you had read the push...), then re-did
> his OPTS changes because they are required for at least 71 and 72, but
> were done at the same time (because they were needed to get 72 to
> compile) and updated to 71, the latest working KVM. The diff
> you see is against master, which did not have the revert. Had I pushed
> the revert first, *then* pushed the update, you would have seen this:
> $ git show a52e45fd8da7de5fb920a8a1df63dae427505445
>
> commit a52e45fd8da7de5fb920a8a1df63dae427505445
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Date: Mon Aug 4 16:32:30 2008 +0000
>
> kvm: Updated to 71
> kvm: Apply Elisamuel's OPT cleanup in BUILD (required for at least
> 71+ to compile)
>
> diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD
> index d16aa18..bff6cdc 100755
> --- a/kernels/kvm/BUILD
> +++ b/kernels/kvm/BUILD
> @@ -1,3 +1,8 @@
> -local KVM_OPTS="--prefix=${INSTALL_ROOT}/usr --disable-gcc-check
> --qemu-cc=gcc --kerneldir=/lib/modules/$(ge -./configure $KVM_OPTS &&
> -make
> +cd "${SOURCE_DIRECTORY}" &&
> +
> +./configure --prefix=${INSTALL_ROOT}/usr \
> + --qemu-cflags="${CFLAGS}" \
> + --qemu-ldflags="${LDFLAGS}" \
> + --kerneldir="/lib/modules/$(get_kernel_version)/build" \
> + --disable-werror &&
> +make
After actually reading over the changes, I understand what you did.
However, it still doesn't explain the formatting changes ;-P. If you
really just cherry-picked the changes from ryuji's commit, then you
would have had his formatting. Of course, you could have typed it all in
manually yourself... ;-P

> Please look at the commit before complaining about it. :p
Quite right, sorry. I should have actually inspected the logs/diffs.
However, I think this is an indication that we need better filters on
SM-Commit for what it actually shows. I would *really* like per-commit
emails instead of per-push emails. In order to reproduce this "commit"
diff I had to run:

git diff
c47bda75b0df90cdbdd54dcc770e1ea8036d2299..a52e45fd8da7de5fb920a8a1df63dae427505445

If the email was commit-based instead of push-based, I'm pretty sure the
correct diff output would have come out, and avoided the problem. But
yes, I was still too lazy to actually go read the git logs/diffs myself
;).

--
Justin "flux" Boffemmyer
Cauldron wizard and general mage
Source Mage GNU/Linux
http://www.sourcemage.org

Attachment: pgpDp6at5YNe1.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page