← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~larsks/cloud-init:feature/move-to-git into cloud-init:master

 


Diff comments:

> diff --git a/README.rst b/README.rst
> new file mode 100644
> index 0000000..e56e663
> --- /dev/null
> +++ b/README.rst
> @@ -0,0 +1,15 @@
> +Cloud-init
> +==========
> +
> +Cloud-init is the defacto multi-distribution package that handles
> +early initialization of a cloud instance.
> +
> +The package is hosted at <https://github.com/cloud-init/cloud-init/>.

That file wasn't even supposed to be there.  Sorry!

> +
> +Additional documentation can be found in the `doc/` subdirectory.
> +
> +Contributing
> +------------
> +
> +For information about how to contribute to cloud-init development, see
> +the file ``HACKING.rst`` included in this distribution.
> diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
> index 254d209..71c71be 100644
> --- a/packages/redhat/cloud-init.spec.in
> +++ b/packages/redhat/cloud-init.spec.in
> @@ -5,13 +5,9 @@
>  # Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets
>  # Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html
>  
> -#for $d in $defines
> -%define ${d}
> -#end for
> -
>  Name:           cloud-init
>  Version:        ${version}
> -Release:        ${release}${subrelease}%{?dist}
> +Release:        1${subrelease}%{?dist}

Nope.  I am following https://fedoraproject.org/wiki/Packaging:Naming?rd=Packaging:NamingGuidelines w/r/t version and release.

>  Summary:        Cloud instance init scripts
>  
>  Group:          System Environment/Base
> diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
> index 53e6ad1..74b6f12 100644
> --- a/packages/suse/cloud-init.spec.in
> +++ b/packages/suse/cloud-init.spec.in
> @@ -157,7 +153,3 @@ mkdir -p %{buildroot}/var/lib/cloud
>  %{python_sitelib}/*
>  
>  /var/lib/cloud
> -
> -%changelog
> -
> -${changelog}

Because this script is (as I understood it?) only being used for dev/test, the changelog didn't seem relevant (and there was a lot of logic just to handle that).  All of the rpm-based downstreams I'm familiar with ship their own spec files.



-- 
https://code.launchpad.net/~larsks/cloud-init/+git/cloud-init/+merge/300953
Your team cloud init development team is requested to review the proposed merge of ~larsks/cloud-init:feature/move-to-git into cloud-init:master.


References