On 09/12/14 15:52, Martin Basti wrote:
On 04/12/14 14:18, Gabe Alford wrote:
Thanks for the assistance Lukas! I have an updated patch attached.

Thanks,

Gabe

On Wed, Dec 3, 2014 at 9:30 AM, Lukas Slebodnik <lsleb...@redhat.com <mailto:lsleb...@redhat.com>> wrote:

    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 <mko...@redhat.com
    <mailto:mko...@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
    <mko...@redhat.com <mailto:mko...@redhat.com>
    >> >> <mailto:mko...@redhat.com <mailto:mko...@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
    >> >>     <redhatri...@gmail.com <mailto:redhatri...@gmail.com>
    <mailto:redhatri...@gmail.com <mailto:redhatri...@gmail.com>>> wrote:
    >> >>     >
    >> >>     >> This patch removes the app_PYTHON usage.
    >> >>     >>
    >> >>     >> Thanks,
    >> >>     >>
    >> >>     >> Gabe
    >> >>     >>
    >> >>     >> On Thu, Nov 27, 2014 at 9:40 AM, Martin Kosek
    <mko...@redhat.com <mailto:mko...@redhat.com>
    >> >>     <mailto:mko...@redhat.com <mailto:mko...@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 <
    >> pspa...@redhat.com <mailto:pspa...@redhat.com>
    >> >>     <mailto:pspa...@redhat.com
    <mailto:pspa...@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
    >> >>     <redhatri...@gmail.com <mailto:redhatri...@gmail.com>
    <mailto:redhatri...@gmail.com <mailto:redhatri...@gmail.com>>
    >> >>     >>>>> <javascript:;>
    >> >>  >>>>>>> <mailto:redhatri...@gmail.com
    <mailto:redhatri...@gmail.com> <mailto:redhatri...@gmail.com
    <mailto:redhatri...@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 <redhatri...@gmail.com <mailto:redhatri...@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 <http://configure.ac>


    It should fix problem with autoreconf.

    LS


Sorry I can't build RPMS

RPM build errors:
Directory not found: /root/freeipa/rpmbuild/BUILDROOT/freeipa-4.1.2-0.fc21.x86_64/usr/lib/python2.7/site-packages/ipaclient File not found by glob: /root/freeipa/rpmbuild/BUILDROOT/freeipa-4.1.2-0.fc21.x86_64/usr/lib/python2.7/site-packages/ipaclient/*.py*
Makefile:229: recipe for target 'rpms' failed


The problem is, we don't have setup.py script for ipa client (just for ipaserver). I suggest to remove only Changelog from ipa-client, and let other parts of ipa-client related Makefiles untouched.

Martin^2

Gabe sent me the updated patch without copy for devel-list.

I attach the patch.

ACK, works as expected.

Thanks Gabe!

--
Martin Basti

From ace355a15c71e5ae5d1f86ac3c5eaa14c3d7e78a Mon Sep 17 00:00:00 2001
From: Gabe <redhatri...@gmail.com>
Date: Tue, 9 Dec 2014 18:40:52 -0700
Subject: [PATCH] Remove usage of app_PYTHON in ipaserver Makefiles

- Remove ChangeLog from ipa-client/Makefile.am

https://fedorahosted.org/freeipa/ticket/4700
---
 ipa-client/Makefile.am                | 20 --------------------
 ipaserver/install/Makefile.am         | 27 ---------------------------
 ipaserver/install/plugins/Makefile.am | 24 ------------------------
 3 files changed, 71 deletions(-)
 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..0da351c6a28a4e2a216bec3f85d0500e4aef47ff 100644
--- a/ipa-client/Makefile.am
+++ b/ipa-client/Makefile.am
@@ -97,7 +97,6 @@ EXTRA_DIST =			\
 	README			\
 	HACKING			\
 	NEWS			\
-	ChangeLog		\
 	$(NULL)
 
 DISTCLEANFILES =		\
@@ -125,22 +124,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/ipaserver/install/Makefile.am b/ipaserver/install/Makefile.am
deleted file mode 100644
index 9fcad4e77c93cf44ed5fcf3ff793233ba35482c1..0000000000000000000000000000000000000000
--- a/ipaserver/install/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-NULL =
-
-appdir = $(pythondir)/ipaserver
-app_PYTHON = 			\
-	__init__.py		\
-	bindinstance.py		\
-	cainstance.py		\
-	dsinstance.py		\
-	ipaldap.py		\
-	krbinstance.py		\
-	httpinstance.py		\
-	ntpinstance.py		\
-	adtrustinstance.py	\
-	service.py		\
-	installutils.py		\
-	replication.py		\
-	certs.py		\
-        ldapupdate.py		\
-        certmonger.py		\
-	$(NULL)
-
-EXTRA_DIST =			\
-	$(NULL)
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in
diff --git a/ipaserver/install/plugins/Makefile.am b/ipaserver/install/plugins/Makefile.am
deleted file mode 100644
index d651297ac141b0f05831e7fabbb9b561cdd239c7..0000000000000000000000000000000000000000
--- a/ipaserver/install/plugins/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-NULL =
-
-appdir = $(pythondir)/ipaserver/install
-app_PYTHON = 			\
-	__init__.py		\
-	baseupdate.py		\
-	fix_replica_agreements.py	\
-	rename_managed.py	\
-	dns.py			\
-	updateclient.py		\
-	update_services.py	\
-	update_anonymous_aci.py	\
-	update_pacs.py		\
-	update_referint.py	\
-	ca_renewal_master.py	\
-	update_uniqueness.py	\
-	$(NULL)
-
-EXTRA_DIST =			\
-	$(NULL)
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in
-- 
2.0.0

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to