Compare commits

..

3 Commits

Author SHA1 Message Date
clrbuilder 38059c0401 Update packages file for version 20360
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-01-17 06:00:59 -08:00
Patrick McCarty 1cc337d5fa Fix support for ARCHIVES in autospec rules
PKG_NAME and URL were properly supported, but ARCHIVES needed to be
written back to the package repo makefile.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-01-16 13:22:57 -08:00
clrbuilder d2b87af7d3 Update packages file for version 20350
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-01-16 12:00:43 -08:00
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -148,7 +148,7 @@ autospec: pullrebase
echo "Specfile already exists and was not created by autospec.py! Aborting."; \
exit 1; \
fi
@printf 'PKG_NAME := %s\nURL = %s\n\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' > Makefile
@printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' '$(value ARCHIVES)' > Makefile
python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --integrity \
${NON_INTERACTIVE} --config "$(AUTOSPEC_CONF)" ${SKIP_GIT} \
$(firstword $(NEWURL) $(URL)) --name $(PKG_NAME) ${CLEANUP} \
+2 -2
View File
@@ -189,14 +189,14 @@ provides:
#help process. For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
autospecnew:
@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
echo "Please specify NAME and URL"; \
echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
exit 1; \
fi
@git clone $(PKG_BASE_URL)/$(NAME) $(TOPLVL)/packages/$(NAME) &> /dev/null || true
@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
echo "no remote repository found, creating new package repository and running autospec"; \
mkdir -p $(TOPLVL)/packages/$(NAME); \
printf 'PKG_NAME := %s\nURL = %s\n\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' '$(value ARCHIVES)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME); \
$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
else \
+2
View File
@@ -127,6 +127,7 @@ clr-power-tweaks
clr-python-timestamp
clr-R-helpers
clr-rpm-config
clr-service-restart
clr-systemd-config
clr-update-triggers
clr-wallpapers
@@ -1209,6 +1210,7 @@ rsa
rsync
ruby
runc
rust-std32
rustc
rxvt-unicode
s2tc