Alon Bar-Lev has posted comments on this change. Change subject: packaging: using patches to customize war instead of overwrites ......................................................................
Patch Set 3: (6 comments) http://gerrit.ovirt.org/#/c/24275/3/Makefile File Makefile: Line 183: $(GENERATED) \ Line 184: $(NULL) Line 185: $(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)" Line 186: $(MAKE) copy-recursive SOURCEDIR=packaging/setup TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/../ovirt-engine/setup" EXCLUDE_GEN="$(GENERATED)" Line 187: for d in conf etc war-patches jasper-customizations ovirt-reports; do \ war-patches -> jasper-war-patches? Line 188: $(MAKE) copy-recursive SOURCEDIR="packaging/$${d}" TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \ Line 189: done Line 190: Line 191: install-layout: \ http://gerrit.ovirt.org/#/c/24275/3/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py File packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py: Line 803: ) Line 804: ): Line 805: rc, stdout, stderr = self.execute( Line 806: args=( Line 807: '/usr/bin/patch', > you'll need to require patch in spec file and you should use self.command. explaination.... to spec add sorted: Require: patch after _init add: @plugin.event( stage=plugin.Stages.STAGE_SETUP, ) def _setup(self): self.command.detect('patch') then use it as self.command.get('patch') Line 808: '-p2', Line 809: '-i', Line 810: p, Line 811: ), Line 804: ): Line 805: rc, stdout, stderr = self.execute( Line 806: args=( Line 807: '/usr/bin/patch', Line 808: '-p2', please use -p1 and adjust patch Line 809: '-i', Line 810: p, Line 811: ), Line 812: cwd=( Line 805: rc, stdout, stderr = self.execute( Line 806: args=( Line 807: '/usr/bin/patch', Line 808: '-p2', Line 809: '-i', please use: '-i', p, so it be clear that p belongs to -i Line 810: p, Line 811: ), Line 812: cwd=( Line 813: oreportscons.FileLocations. Line 811: ), Line 812: cwd=( Line 813: oreportscons.FileLocations. Line 814: OVIRT_ENGINE_REPORTS_JASPER_WAR Line 815: ), use -d instead Line 816: ) Line 817: Line 818: base = oreportscons.FileLocations.OVIRT_ENGINE_JASPER_CUSTOMIZATION Line 819: for directory, dirs, files in os.walk(base): http://gerrit.ovirt.org/#/c/24275/3/packaging/war-patches/disable-heartbeat-reporting.patch File packaging/war-patches/disable-heartbeat-reporting.patch: Line 1: --- a/ovirt-engine-reports.war/WEB-INF/js.config.properties Line 2: +++ b/ovirt-engine-reports.war/WEB-INF/js.config.properties are you sure there is no other way to modify properties? usually there can be suffix or similar mechanism. Line 3: @@ -6,8 +6,8 @@ Line 4: monitoring.enabled=false Line 5: Line 6: # Enable or disable HeartBeat -- To view, visit http://gerrit.ovirt.org/24275 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If0becc8ef9206fa077547682fd4c299fa5491b15 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <yd...@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbona...@redhat.com> Gerrit-Reviewer: Yaniv Dary <yd...@redhat.com> Gerrit-Reviewer: Yedidyah Bar David <d...@redhat.com> Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
