New spin-kickstarts practices for f20 / rawhide
by Bruno Wolff III
When adding new ks files to spin-kickstarts you no longer have to
edit Makefile.am.
When you want to build a new spin kickstart package, you checkout the
version of spin-kickstarts you want to use (use reset --hard if HEAD
isn't going to be the latest commit). Tag the commit (don't forget to
push the tag as tags aren't normally pushed by default).
make will make the tar ball.
make publish will scp the tar ball to the fedorahosted download area.
Then checkout the fedora package spin-kickstarts.
fedpkg new-sources the new tar ball.
change the version and add a changelog entry to the spec file.
fedpkg build
fedora-install-fedora.ks now points to the rawhide repo in master. When
f20 is branched it will point to fedora repos. The excludes have been
moved off the repo commands, so when overriding the repos you don't
need to include a bunch of excludes.
When branching, the only two files that need to be changed (to adjust the
repos) are fedora-install-fedora.ks and fedora-repo.ks.
9 years, 11 months
[spin-kickstarts] Handle trying to remake the tar ball
by Bruno Wolff III
commit 314afb81d0feb883ebd888889a1f495e0daf1380
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 22:18:08 2013 -0500
Handle trying to remake the tar ball
Now running make when the tar ball already exists will result
in it not being recreated.
Makefile | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index b0c726a..75696da 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,9 @@ install:
clean:
rm -f $(name)-*.tar.gz
-dist:
+dist: $(name)-$(version).tar.gz
+
+$(name)-$(version).tar.gz:
git archive --format=tar --prefix=$(name)-$(version)/ HEAD | gzip > $(name)-$(version).tar.gz
publish:
9 years, 11 months
[spin-kickstarts] Fix to work with multiple tags
by Bruno Wolff III
commit 0ecefe0230e2135e2a93939ae573f6e22ac97c46
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 22:08:06 2013 -0500
Fix to work with multiple tags
If there are multiple tags pointing to HEAD we need to pick only
one. We'll take one that seems to be a version number. This allows
the version number tag to coexist with another tag, that perhaps
indicates which images it was used to build.
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index f924b0c..b0c726a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD)
+version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
# And if it wasn't use a git hash
ifeq ($(version),)
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
9 years, 11 months
RFC 4 - Make building package not require commits
by Bruno Wolff III
Currently when building a new spin-kickstarts package a new commit is needed
after changing configure.ac and spin-kickstarts.spec.in. This is kind of
awkward when trying to build a new package based on a specific commit
used to build an RC (especially if other commits have been added since
the one we are targeting).
I won't work on this until after spin-kickstarts.spec.in isn't being
maintained in the git repo any more (RFC 2).
I am not sure exactly how I would like to implement this, so comments are
welcome.
My thought is that if there is a tag for the current commit that that
tag would get used as the version (which would get used in the tar ball
name). If there was no match then I was thinking of using a version
like git-<commit id prefix>.
I would change the make file to just support make dist (which would just
build a tar ball) and make clean. The autotools stuff would go away.
9 years, 11 months
Re: [Fedora-spins] RFC 3 - Stop tracking ks files in Makefile.am
by Bruno Wolff III
On Tue, May 28, 2013 at 21:51:50 +0000,
Bruno Wolff III <bruno(a)wolff.to> wrote:
>Currently whenever anyone adds a ks file to the fedorahosted repo, they
>also need to get added to Makefile.am in order to end up in the fedora
>package. This seems to be forgotten more often then it is remembered.
>For f20 I'd like to include ks files by default when new ones show up
>in the fedora hosted repo. This would affect the make dist command which
>builds the tar file that gets used by fedora packages.
This has been completed.
9 years, 11 months
Re: [Fedora-spins] RFC 2 - Stop maintaining spec file upstream
by Bruno Wolff III
On Tue, May 28, 2013 at 21:51:12 +0000,
Bruno Wolff III <bruno(a)wolff.to> wrote:
>For f20 I'd like to stop maintaining the spec file in the fedorahosted repo.
>This doesn't really save any work with the way we are doing things now. We
>don't publish srpms from federahosted, so there doesn't seem to be a good
>reason to do this any more. It just makes it easy to accidentally clobber info
>in the fedora packages. (And arguably is more work.)
This has been completed.
9 years, 11 months
[spin-kickstarts] Don't install stuff that ends in the doc directory
by Bruno Wolff III
commit 247595b7625959d9f05496a81e992c74bbfdf811
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 15:59:10 2013 -0500
Don't install stuff that ends in the doc directory
Makefile | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/Makefile b/Makefile
index 371d125..f924b0c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,6 @@ install:
install -m 644 custom/* $(DATADIR)/$(name)/custom
mkdir -p -m 755 $(DATADIR)/$(name)/l10n
install -m 644 l10n/* $(DATADIR)/$(name)/l10n
- mkdir -p -m 755 $(DOCDIR)/$(name)-$(version)
- install -m 644 AUTHORS COPYING README $(DOCDIR)/$(name)-$(version)
clean:
rm -f $(name)-*.tar.gz
9 years, 11 months
[spin-kickstarts] Make directories if needed and use specific permissions
by Bruno Wolff III
commit 8311504e19d6225ec5f13576159eaaf9bed45ea0
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 15:44:34 2013 -0500
Make directories if needed and use specific permissions
Makefile | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/Makefile b/Makefile
index b4de337..371d125 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +9,21 @@ DESTDIR := /usr
DATADIR := $(DESTDIR)/share
-DOCDIR := $(DATADIR)/doc/
+DOCDIR := $(DATADIR)/doc
name := spin-kickstarts
all: dist
install:
- install *.ks* $(DATADIR)/$(name)
- install custom/* $(DATADIR)/$(name)/custom
- install l10n/* $(DATADIR)/$(name)/l10n
- install AUTHORS COPYING README $(DOCDIR)/$(name)-$(version)
+ mkdir -p -m 755 $(DATADIR)/$(name)
+ install *.ks* -m 644 $(DATADIR)/$(name)
+ mkdir -p -m 755 $(DATADIR)/$(name)/custom
+ install -m 644 custom/* $(DATADIR)/$(name)/custom
+ mkdir -p -m 755 $(DATADIR)/$(name)/l10n
+ install -m 644 l10n/* $(DATADIR)/$(name)/l10n
+ mkdir -p -m 755 $(DOCDIR)/$(name)-$(version)
+ install -m 644 AUTHORS COPYING README $(DOCDIR)/$(name)-$(version)
clean:
rm -f $(name)-*.tar.gz
9 years, 11 months