forked from pool/cloud-init
Robert Schweikert
738f268769
+ Version numbering scheme change now YY.NUMBER_OF_RELESE_THAT_YEAR
+ Remove cloud.cfg.suse, use generated default config file
+ Remove addopenSUSEBase.patch, included upstream
+ Remove suseIntegratedHandler.patch, included upstream
+ Remove openSUSEhostsTemplate.diff, included upstream
+ Remove cloud-init-handle-no-carrier.patch, included upstream
+ Remove cloud-init-digital-ocean-datasource.patch,
use upstream implementation
+ Remove cloud-init-digital-ocean-datasource-enable-by-default.patch,
use upstream implementation
+ Remove cloud-init-fix-unicode-handling-binarydecode.patch,
included upstream
+ Remove cloud-init-no-dmidecode-on-ppc64.patch, included upstream
+ Remove dataSourceOpenNebula.patch, use upstream implementation
+ Remove setupSUSEsysVInit.diff, included upstream
+ Remove SUSEsysVInit.diff, included upstream
+ Remove cloud-init-finalbeforelogin.patch, don't block login
+ Remove cloud-init-handle-not-implemented-query.patch, query option removed
+ Remove cloud-init-spceandtabs-clean.patch, indentation fixed upstream
+ Remove dynamicInitCmd.diff, different solution from upstream
+ Added cloud-init-more-tasks.patch, (bsc#1047363)
replace cloud-init-finalbeforelogin.patch
+ Forward port cloud-init-python2-sigpipe.patch
+ Remove cloud-init-net-eni.patch, included upstream
+ Remove cloud-init-service.patch, included upstream
+ Forward port cloud-init-sysconfig-netpathfix.patch
+ Remove cloud-init-net-sysconfig-lp1665441.patch, included upstream
+ Remove cloud-init-python26.patch, included upstream
+ Add cloud-init-tests-set-exec.patch
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=88
21 lines
410 B
Diff
21 lines
410 B
Diff
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -11,7 +11,7 @@ PIP_INSTALL := pip install
|
|
|
|
ifeq ($(PYVER),python3)
|
|
pyflakes = pyflakes3
|
|
- unittests = unittest3
|
|
+ unittests = unittest
|
|
yaml = yaml
|
|
else
|
|
ifeq ($(PYVER),python2)
|
|
@@ -19,7 +19,7 @@ ifeq ($(PYVER),python2)
|
|
unittests = unittest
|
|
else
|
|
pyflakes = pyflakes pyflakes3
|
|
- unittests = unittest unittest3
|
|
+ unittests = unittest unittest
|
|
endif
|
|
endif
|
|
|