mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	Fix for -SNAPSHOT problem in debian rules. Use -snapshot in the changelog to force the packaging to use the -SNAPSHOT extension for maven targets
This commit is contained in:
		
							parent
							
								
									2621602787
								
							
						
					
					
						commit
						2b47611c5d
					
				
							
								
								
									
										2
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							| @ -1,4 +1,4 @@ | ||||
| cloudstack (4.3.0) unstable; urgency=low | ||||
| cloudstack (4.3.0-snapshot) unstable; urgency=low | ||||
| 
 | ||||
|   * Update the version to 4.3.0.snapshot | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										11
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @ -12,6 +12,7 @@ | ||||
| 
 | ||||
| DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') | ||||
| VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') | ||||
| MVNADD := $(shell if echo '$(DEBVERS)' | grep -q snapshot; then echo -SNAPSHOT; fi ) | ||||
| PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1) | ||||
| SYSCONFDIR = "/etc" | ||||
| DESTDIR = "debian/tmp" | ||||
| @ -65,8 +66,8 @@ install: | ||||
| 	mkdir $(DESTDIR)/var/log/$(PACKAGE)/agent | ||||
| 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent | ||||
| 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins | ||||
| 	install -D agent/target/cloud-agent-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar | ||||
| 	install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ | ||||
| 	install -D agent/target/cloud-agent-$(VERSION)$(MVNADD) $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar | ||||
| 	install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ | ||||
| 	install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ | ||||
| 	install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent | ||||
| 	install -D agent/target/transformed/cloud-setup-agent $(DESTDIR)/usr/bin/cloudstack-setup-agent | ||||
| @ -92,7 +93,7 @@ install: | ||||
| 	mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management | ||||
| 	mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt | ||||
| 	cp -r client/target/utilities/scripts/db/* $(DESTDIR)/usr/share/$(PACKAGE)-management/setup/ | ||||
| 	cp -r client/target/cloud-client-ui-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/ | ||||
| 	cp -r client/target/cloud-client-ui-$(VERSION)$(MVNADD)/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/ | ||||
| 	cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/ | ||||
| 	cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/ | ||||
| 
 | ||||
| @ -145,7 +146,7 @@ install: | ||||
| 	mkdir $(DESTDIR)/var/log/$(PACKAGE)/usage | ||||
| 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage | ||||
| 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins | ||||
| 	install -D usage/target/cloud-usage-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar | ||||
| 	install -D usage/target/cloud-usage-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar | ||||
| 	install -D usage/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/ | ||||
| 	cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/ | ||||
| 	cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml | ||||
| @ -158,7 +159,7 @@ install: | ||||
| 	mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi | ||||
| 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup | ||||
| 	ln -s /usr/share/$(PACKAGE)-bridge/webapps/awsapi $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080/awsapi | ||||
| 	cp -r awsapi/target/cloud-awsapi-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi | ||||
| 	cp -r awsapi/target/cloud-awsapi-$(VERSION)$(MVNADD)/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi | ||||
| 	install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge | ||||
| 	install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register | ||||
| 	cp -r awsapi-setup/db/mysql/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user