Summary: | apache-2.eclass: please review prefix changes | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Christoph Junghans (RETIRED) <junghans> |
Component: | [OLD] Server | Assignee: | Lars Wendler (Polynomial-C) (RETIRED) <polynomial-c> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | alanh, mail, prefix, proxy-maint |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 315803 | ||
Attachments: |
patch against apache-2.4.7
patch against gx86 version |
Description
Christoph Junghans (RETIRED)
2012-09-03 03:03:18 UTC
+ 12 Oct 2012; Patrick Lauer <patrick@gentoo.org> +apache-2.4.3.ebuild, + -apache-2.4.2.ebuild, metadata.xml: + Bump with fixes from #410607 #411433 #433736 (In reply to comment #1) > + 12 Oct 2012; Patrick Lauer <patrick@gentoo.org> +apache-2.4.3.ebuild, > + -apache-2.4.2.ebuild, metadata.xml: > + Bump with fixes from #410607 #411433 #433736 $ grep EAPI /usr/portage/www-servers/apache/*.ebuild /usr/portage/www-servers/apache/apache-2.2.22-r1.ebuild:EAPI="2" /usr/portage/www-servers/apache/apache-2.2.23.ebuild:EAPI="2" /usr/portage/www-servers/apache/apache-2.4.3.ebuild:EAPI="2" Where is the EAPI bump? Created attachment 364378 [details, diff]
patch against apache-2.4.7
Ok, apache-2.4.7 is EAPI 5, so adding prefix support is trivial.
We still need to merge apache-2.eclass, but that is a different bug.
Hmm, we have a prefix patch in the overlay. However doing something like: $ sed -i "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&/g' conf/httpd.conf scripts/* docs/*.example patches/*.layout init/* conf/vhosts.d/* conf/modules.d/* will do pretty much the same thing! Any opinions? you need to fix the quotes (starts with ", ends with ') but if the sed can do it iso a patch, in this case I think that can be justified, since the need will always stay Fixed? $ grep EAPIapache-2.* apache-2.2.27.ebuild:EAPI=5 apache-2.2.27-r3.ebuild:EAPI=5 apache-2.4.9-r3.ebuild:EAPI=5 (In reply to Michael Orlitzky from comment #6) > Fixed? > > $ grep EAPIapache-2.* > apache-2.2.27.ebuild:EAPI=5 > apache-2.2.27-r3.ebuild:EAPI=5 > apache-2.4.9-r3.ebuild:EAPI=5 We need to add this to the ebuild: > $ sed -i "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&/g" conf/httpd.conf > scripts/* docs/*.example patches/*.layout init/* conf/vhosts.d/* > conf/modules.d/* (In reply to Christoph Junghans from comment #7) > (In reply to Michael Orlitzky from comment #6) > > Fixed? > > > > $ grep EAPIapache-2.* > > apache-2.2.27.ebuild:EAPI=5 > > apache-2.2.27-r3.ebuild:EAPI=5 > > apache-2.4.9-r3.ebuild:EAPI=5 > > We need to add this to the ebuild: > > $ sed -i "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&/g" conf/httpd.conf > > scripts/* docs/*.example patches/*.layout init/* conf/vhosts.d/* > > conf/modules.d/* Feel free to add the necessary changes to the unstable ebuilds but if possible without a revbump please. added apache-2.4.10 without keywords to prefix overlay for testing. Created attachment 381680 [details, diff]
patch against gx86 version
It is the easiest to move the sed command to apache-2.eclass.
Otherwise there are only trivial changes:
- prefix paths here and there
- ${D} -> ${ED}
- ${ROOT} -> ${EROOT}
(In reply to Christoph Junghans from comment #9) > added apache-2.4.10 without keywords to prefix overlay for testing. apache-2.4.10 from gx86 work on my amd64-linux machine, so re-added keywords. ebuilds are gone from prefix overlay (same as gx86), eclass patch still needs review. (In reply to Christoph Junghans from comment #12) > ebuilds are gone from prefix overlay (same as gx86), eclass patch still > needs review. The patch looks good. You have my go to change the eclass accordingly. + 05 Aug 2014; Christoph Junghans <ottxor@gentoo.org> apache-2.eclass: + added prefix support (bug #433736) + |