Download as
Browse Code »

Commit 710f770006cdd1872501b42e85d53e8fd950415a

Authored by Sergio Oliveira
1 parent bc2a3b4f
Exists in master and in 53 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Added command to upload packages to copr 

(cherry picked from commit b53707387cb252e5beee3cd1a0fe99a75199509e)
Showing 1 changed file with 15 additions and 7 deletions   Show diff stats
src/pkg-rpm/Makefile
  Diff comments   View file @710f770
@@ -4,7 +4,7 @@ LOCAL_BUILD_DIR = $(PWD)/build @@ -4,7 +4,7 @@ LOCAL_BUILD_DIR = $(PWD)/build
4 4
5 # Vagrant environment does not accept links from/to shared folder 5 # Vagrant environment does not accept links from/to shared folder
6 ifeq "$(PWD)" "/vagrant" 6 ifeq "$(PWD)" "/vagrant"
7 -LOCAL_BUILD_DIR = /home/vagrant/rpmbuild/ 7 +LOCAL_BUILD_DIR = /home/vagrant/rpmbuild
8 endif 8 endif
9 9
10 ############################################################################# 10 #############################################################################
@@ -17,11 +17,12 @@ obsdir = .obs @@ -17,11 +17,12 @@ obsdir = .obs
17 all: 17 all:
18 @echo "Usage:" 18 @echo "Usage:"
19 @echo 19 @echo
  20 + @echo '$$ make $${pkg}-build builds package $${pkg} locally'
  21 + @echo '$$ make $${pkg}-build-src builds SRPM package $${pkg} locally'
  22 + @echo '$$ make $${pkg}-upload uploads package $${pkg} to Copr'
20 @echo 23 @echo
21 @echo '$${pkg} can be one of: $(packages)' 24 @echo '$${pkg} can be one of: $(packages)'
22 @echo 25 @echo
23 - @echo '$$ make $${pkg}-build builds package $${pkg} locally'  
24 - @echo  
25 @echo 'Operations on all packages:' 26 @echo 'Operations on all packages:'
26 @echo 27 @echo
27 @echo '$$ make build-all builds all packages locally' 28 @echo '$$ make build-all builds all packages locally'
@@ -48,6 +49,8 @@ all: @@ -48,6 +49,8 @@ all:
48 build_packages = $(patsubst %, %-build, $(packages)) 49 build_packages = $(patsubst %, %-build, $(packages))
49 build_src_packages = $(patsubst %, %-build-src, $(packages)) 50 build_src_packages = $(patsubst %, %-build-src, $(packages))
50 51
  52 +# Copr
  53 +upload_packages = $(patsubst %, %-upload, $(packages))
51 54
52 # OBS 55 # OBS
53 checkout_packages_obs = $(patsubst %, %-checkout-obs, $(packages)) 56 checkout_packages_obs = $(patsubst %, %-checkout-obs, $(packages))
@@ -56,6 +59,8 @@ diff_packages_obs = $(patsubst %, %-diff-obs, $(packages)) @@ -56,6 +59,8 @@ diff_packages_obs = $(patsubst %, %-diff-obs, $(packages))
56 59
57 .PHONY: $(build_packages) $(checkout_packages_obs) $(upload_packages_obs) $(diff_packages_obs) 60 .PHONY: $(build_packages) $(checkout_packages_obs) $(upload_packages_obs) $(diff_packages_obs)
58 61
  62 +### Targets
  63 +
59 build-all: $(build_packages) 64 build-all: $(build_packages)
60 65
61 $(build_packages): %-build : % 66 $(build_packages): %-build : %
@@ -65,11 +70,14 @@ $(build_packages): %-build : % @@ -65,11 +70,14 @@ $(build_packages): %-build : %
65 cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(LOCAL_BUILD_DIR)" -bb $*.spec 70 cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(LOCAL_BUILD_DIR)" -bb $*.spec
66 71
67 $(build_src_packages): %-build-src : % 72 $(build_src_packages): %-build-src : %
68 - mkdir -p build/SOURCES  
69 - cp $*/*.tar.* build/SOURCES/  
70 - cp $*/*.patch build/SOURCES/ || true  
71 - cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(PWD)/build/" -bs $*.spec --nodeps 73 + mkdir -p $(LOCAL_BUILD_DIR)/SOURCES
  74 + cp $*/*.tar.* $(LOCAL_BUILD_DIR)/SOURCES/
  75 + cp $*/*.patch $(LOCAL_BUILD_DIR)/SOURCES/ || true
  76 + rm $(LOCAL_BUILD_DIR)/SRPMS/$*-*.src.rpm
  77 + cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(LOCAL_BUILD_DIR)" -bs $*.spec --nodeps
72 78
  79 +$(upload_packages): %-upload : %-build-src %
  80 + copr-cli build $(COPR_PROJECT) $(LOCAL_BUILD_DIR)/SRPMS/$*-*.src.rpm --nowait
73 81
74 ### OBS targets (deprecated) 82 ### OBS targets (deprecated)
75 83