[Freeipa-devel] [PATCH 0036] Add missing python files to Makefile
Lukas Slebodnik
lslebodn at redhat.com
Wed Dec 3 16:30:23 UTC 2014
On (02/12/14 21:13), Gabe Alford wrote:
>This patch removes the changelog and Makefile.am for ipaclient as well.
>
>Thanks,
>
>Gabe
>
>On Mon, Dec 1, 2014 at 8:28 AM, Martin Kosek <mkosek at redhat.com> wrote:
>
>> On 12/01/2014 04:25 PM, Rob Crittenden wrote:
>> > Gabe Alford wrote:
>> >>
>> >> On Mon, Dec 1, 2014 at 6:05 AM, Martin Kosek <mkosek at redhat.com
>> >> <mailto:mkosek at redhat.com>> wrote:
>> >>
>> >> On 11/30/2014 03:28 AM, Gabe Alford wrote:
>> >> > Ignore the last patch. Updated patch attached.
>> >> >
>> >> > On Sat, Nov 29, 2014 at 6:03 PM, Gabe Alford
>> >> <redhatrises at gmail.com <mailto:redhatrises at gmail.com>> wrote:
>> >> >
>> >> >> This patch removes the app_PYTHON usage.
>> >> >>
>> >> >> Thanks,
>> >> >>
>> >> >> Gabe
>> >> >>
>> >> >> On Thu, Nov 27, 2014 at 9:40 AM, Martin Kosek <mkosek at redhat.com
>> >> <mailto:mkosek at redhat.com>> wrote:
>> >> >>
>> >> >>> Exactly, this was the message from Martin :-) I did not test it
>> >> myself,
>> >> >>> but
>> >> >>> removing all app_PYTHON should be benign given we use Python
>> >> setup.py
>> >> >>> packaging.
>> >> >>>
>> >> >>> On 11/27/2014 04:27 PM, Gabe Alford wrote:
>> >> >>>> Thanks guys. Sounds like it would be better to submit a patch
>> that
>> >> >>> removes
>> >> >>>> app_PYTHON if it is considered dead code.
>> >> >>>>
>> >> >>>> Gabe
>> >> >>>>
>> >> >>>> On Thursday, November 27, 2014, Petr Spacek <
>> pspacek at redhat.com
>> >> <mailto:pspacek at redhat.com>> wrote:
>> >> >>>>
>> >> >>>>> On 27.11.2014 11:00, Martin Basti wrote:
>> >> >>>>>> On 27/11/14 00:50, Gabe Alford wrote:
>> >> >>>>>>> Hello,
>> >> >>>>>>>
>> >> >>>>>>> Wondering if I could get a review. Updated patch
>> >> attached.
>> >> >>>>>>>
>> >> >>>>>>> Thanks,
>> >> >>>>>>> Gabe
>> >> >>>>>>>
>> >> >>>>>>> On Tue, Nov 11, 2014 at 7:21 AM, Gabe Alford
>> >> <redhatrises at gmail.com <mailto:redhatrises at gmail.com>
>> >> >>>>> <javascript:;>
>> >> >>>>>>> <mailto:redhatrises at gmail.com <mailto:redhatrises at gmail.com
>> >
>> >> <javascript:;>>> wrote:
>> >> >>>>>>>
>> >> >>>>>>> Hello,
>> >> >>>>>>>
>> >> >>>>>>> Fix for https://fedorahosted.org/freeipa/ticket/4700
>> >> >>>>>>>
>> >> >>>>>>> Thanks,
>> >> >>>>>>>
>> >> >>>>>>> Gabe
>> >> >>>>>>>
>> >> >>>>>>>
>> >> >>>>>>>
>> >> >>>>>> Hello,
>> >> >>>>>>
>> >> >>>>>> sorry for late response.
>> >> >>>>>>
>> >> >>>>>> We push this ticket to backlog, as it would be part of build
>> >> system
>> >> >>>>> refactoring.
>> >> >>>>>> The "app_PYTHON" statement is not used anymore in IPA, the
>> better
>> >> >>>>> solution is
>> >> >>>>>> remove it, instead of keeping dead code up-to-date.
>> >> >>>>>
>> >> >>>>> Just to clarify:
>> >> >>>>> It can be pushed if it works, there is no need to postpone
>> >> accepting
>> >> >>> patch
>> >> >>>>> if
>> >> >>>>> the patch seems okay and doesn't break anything.
>> >> >>>>>
>> >> >>>>> Martin, please keep in mind that contributions are welcome at
>> >> any time.
>> >> >>>>>
>> >> >>>>> Milestones in Trac reflect our view of priorities but it
>> doesn't
>> >> >>> prevent us
>> >> >>>>> from accepting correct patches from contributions at any
>> time, no
>> >> >>> matter
>> >> >>>>> which
>> >> >>>>> priority is stated in Trac (or even if there is no ticket for
>> >> it ...).
>> >> >>>>>
>> >> >>>>> --
>> >> >>>>> Petr^2 Spacek
>> >>
>> >> Worked in my tests, I did not see any breakage. I guess we can also
>> >> remove the
>> >> ipa-client/ipaclient/Makefile.am while we are at it.
>> >>
>> >> Martin
>> >>
>> >>
>> >> It looks like the ipaclient/Makefile.am is still being used. I tried
>> >> removing it and there were errors in the build, but maybe I am wrong?
>> >
>> > It is needed to build ipa-join, ipa-getkeytab and ipa-rmkeytab.
>> >
>> > Feel free to rip out the outdated hg ChangeLog stuff though.
>> >
>> > rob
>>
>> I think Gabe was asking about ipa-client/ipaclient/Makefile.am and not
>> about
>> ipa-client/Makefile.am - we still need this one as Rob correctly said.
>>
>> The failure that Gabe hit in build probably comes from the the SUBDIR
>> reference
>> in ipa-client/Makefile.am file. I assume that if the reference is removed,
>> the
>> removal should work.
>>
>> And yes, you can remove the Changelog too if you are OK with it :)
>>
>> Martin
>>
>From d2e3176b6f6f2abb2ffbdfc198814bd1a845b876 Mon Sep 17 00:00:00 2001
>From: Gabe <redhatrises at gmail.com>
>Date: Tue, 2 Dec 2014 14:43:57 -0700
>Subject: [PATCH] Remove usage of app_PYTHON in ipaserver Makefiles
>
>https://fedorahosted.org/freeipa/ticket/4700
>---
> ipa-client/Makefile.am | 21 ---------------------
> ipa-client/ipaclient/Makefile.am | 17 -----------------
> ipaserver/install/Makefile.am | 27 ---------------------------
> ipaserver/install/plugins/Makefile.am | 24 ------------------------
> 4 files changed, 89 deletions(-)
> delete mode 100644 ipa-client/ipaclient/Makefile.am
> delete mode 100644 ipaserver/install/Makefile.am
> delete mode 100644 ipaserver/install/plugins/Makefile.am
>
>diff --git a/ipa-client/Makefile.am b/ipa-client/Makefile.am
>index b9c7020f3b687b3c0030ed5166625e6ef07e2fa4..f6f3168774c3024e10f626b88a8952c51c0eab90 100644
>--- a/ipa-client/Makefile.am
>+++ b/ipa-client/Makefile.am
>@@ -84,7 +84,6 @@ ipa_join_LDADD = \
>
> SUBDIRS = \
> ../asn1 \
>- ipaclient \
> ipa-install \
> man \
> $(NULL)
>@@ -97,7 +96,6 @@ EXTRA_DIST = \
> README \
> HACKING \
> NEWS \
>- ChangeLog \
> $(NULL)
>
> DISTCLEANFILES = \
>@@ -125,22 +123,3 @@ MAINTAINERCLEANFILES = \
> py-compile \
> $(NULL)
>
>-# Creating ChangeLog from hg log (taken from cairo/Makefile.am):
>-
>-ChangeLog: $(srcdir)/ChangeLog
>-
>-$(srcdir)/ChangeLog:
>- @if test -d "$(srcdir)/../.hg"; then \
>- (cd "$(srcdir)" && \
>- ./missing --run hg log --verbose) | fmt --split-only > $@.tmp \
>- && mv -f $@.tmp $@ \
>- || ($(RM) $@.tmp; \
>- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
>- (test -f $@ || echo hg log is required to generate this file >> $@)); \
>- else \
>- test -f $@ || \
>- (echo A hg checkout and hg -log is required to generate ChangeLog >&2 && \
>- echo A hg checkout and hg log is required to generate this file >> $@); \
>- fi
>-
>-.PHONY: ChangeLog $(srcdir)/ChangeLog
>diff --git a/ipa-client/ipaclient/Makefile.am b/ipa-client/ipaclient/Makefile.am
>deleted file mode 100644
>index 01824b86584992fd84d4542da88395aa0e89de12..0000000000000000000000000000000000000000
>--- a/ipa-client/ipaclient/Makefile.am
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-NULL =
>-
>-appdir = $(pythondir)/ipaclient
>-app_PYTHON = \
>- __init__.py \
>- ipachangeconf.py \
>- ipadiscovery.py \
>- ntpconf.py \
>- ipa_certupdate.py \
>- $(NULL)
>-
>-EXTRA_DIST = \
>- $(NULL)
>-
>-MAINTAINERCLEANFILES = \
>- *~ \
>- Makefile.in
You need to remove ipa-client/ipaclient/Makefile.am also from AC_CONFIG_FILES
in file ipa-client/configure.ac
It should fix problem with autoreconf.
LS
More information about the Freeipa-devel
mailing list