diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-11 13:08:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-05-11 13:10:27 +0200 |
| commit | 3f5ddf2e873b76abe3e166089fac2cfcb358d346 (patch) | |
| tree | bbe698d541f10698f036b464f795cd5d38e13bd9 /postprocess | |
| parent | d4e161e87ba11bf13256f66bce7fa96082db4f52 (diff) | |
Fix updchk xcu data after gbuild'ification
For one, install:module was missing from xcu files that are processed with
gb_Configuration_add_spool_modules, resulting in effectively empty output
xcu files. For another, localization from Addons.xcu is now merged into
per-lang registry_*.xcd in postprocess/packregistry/makefile.mk.
Change-Id: Ie87edbad163b124d18090ab36aa36de560a20cbc
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index c9a73bd90c5f..0f05cd6dcb4b 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -531,30 +531,47 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE : $(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)" -$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip -.ENDIF +$(MISC)/lang/registry_{$(alllangiso)}.xcd : \ + $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip +.END + +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +$(MISC)/lang/registry_{$(alllangiso)}.xcd : \ + $(SOLARPCKDIR)/updchk_$$(@:b:s/registry_//).zip +.END $(MISC)/lang/registry_%.xcd .ERRREMOVE : $(MKDIRHIER) $(@:d) + - $(RM) $(MISC)/$(@:b).list + echo '<list>' > $(MISC)/$(@:b).list + # Add registry_*.zip content to *.list: rm -rf $(MISC)/$(@:b).unzip mkdir $(MISC)/$(@:b).unzip cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip + # Filter out filenames starting with ".": + echo $(foreach,i,$(shell cd $(MISC) && \ + find $(@:b).unzip -name \[!.\]\*.xcu -print) \ + '<filename>$i</filename>') >> $(MISC)/$(@:b).list .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)" + # Add fcfg_drivers_*.zip content to *.list: rm -rf $(MISC)/fcfg_drivers_$*.unzip mkdir $(MISC)/fcfg_drivers_$*.unzip - cd $(MISC)/fcfg_drivers_$*.unzip && \ - unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip -.ENDIF - - $(RM) $(MISC)/$(@:b).list - # filter out filenames starting with "." -.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)" - echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \ - '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list -.ELSE - echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip -name \[!.\]\*.xcu -print) \ - '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list -.ENDIF + cd $(MISC)/fcfg_drivers_$*.unzip && unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip + # Filter out filenames starting with ".": + echo $(foreach,i,$(shell cd $(MISC) && \ + find fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \ + '<filename>$i</filename>') >> $(MISC)/$(@:b).list +.END +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" + # Add updchk_*.zip content to *.list: + rm -rf $(MISC)/updchk_$*.unzip + mkdir $(MISC)/updchk_$*.unzip + cd $(MISC)/updchk_$*.unzip && unzip $(SOLARPCKDIR)/updchk_$*.zip + # Filter out filenames starting with ".": + echo $(foreach,i,$(shell cd $(MISC) && \ + find updchk_$*.unzip -name \[!.\]\*.xcu -print) \ + '<filename>$i</filename>') >> $(MISC)/$(@:b).list +.END + echo '</list>' >> $(MISC)/$(@:b).list $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list |