Download as
Browse Code »

Commit bc2a3b4f0d7d02d1a0622b5d381628c9f4cad5ab

Authored by Sergio Oliveira
1 parent ac7c0234
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

Fixed make to allow building packages in vagrant envs 

(cherry picked from commit f8b71b494608dde5ef69c25e784bfb31f4b288ca)
Showing 1 changed file with 12 additions and 5 deletions   Show diff stats
src/pkg-rpm/Makefile
  Diff comments   View file @bc2a3b4
1 OBSPROJECT = isv:spb:devel 1 OBSPROJECT = isv:spb:devel
  2 +COPR_PROJECT = softwarepublico/v4
  3 +LOCAL_BUILD_DIR = $(PWD)/build
  4 +
  5 +# Vagrant environment does not accept links from/to shared folder
  6 +ifeq "$(PWD)" "/vagrant"
  7 +LOCAL_BUILD_DIR = /home/vagrant/rpmbuild/
  8 +endif
2 9
3 ############################################################################# 10 #############################################################################
4 11
@@ -20,7 +27,7 @@ all: @@ -20,7 +27,7 @@ all:
20 @echo '$$ make build-all builds all packages locally' 27 @echo '$$ make build-all builds all packages locally'
21 @echo 28 @echo
22 @echo 29 @echo
23 - @echo 'Working with OBS (deprecated):' 30 + @echo 'Working with OBS (deprecated):'
24 @echo 31 @echo
25 @echo '$$ make $${pkg}-checkout-obs checkout $${pkg}' 32 @echo '$$ make $${pkg}-checkout-obs checkout $${pkg}'
26 @echo '$$ make $${pkg}-upload-obs uploads package $${pkg}' 33 @echo '$$ make $${pkg}-upload-obs uploads package $${pkg}'
@@ -52,10 +59,10 @@ diff_packages_obs = $(patsubst %, %-diff-obs, $(packages)) @@ -52,10 +59,10 @@ diff_packages_obs = $(patsubst %, %-diff-obs, $(packages))
52 build-all: $(build_packages) 59 build-all: $(build_packages)
53 60
54 $(build_packages): %-build : % 61 $(build_packages): %-build : %
55 - mkdir -p build/SOURCES  
56 - cp $*/*.tar.* build/SOURCES/  
57 - cp $*/*.patch build/SOURCES/ || true  
58 - cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(PWD)/build/" -bb $*.spec 62 + mkdir -p $(LOCAL_BUILD_DIR)/SOURCES
  63 + cp $*/*.tar.* $(LOCAL_BUILD_DIR)/SOURCES/
  64 + cp $*/*.patch $(LOCAL_BUILD_DIR)/SOURCES/ || true
  65 + cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(LOCAL_BUILD_DIR)" -bb $*.spec
59 66
60 $(build_src_packages): %-build-src : % 67 $(build_src_packages): %-build-src : %
61 mkdir -p build/SOURCES 68 mkdir -p build/SOURCES