[spin-kickstarts] Fix up the Makefile
by Bruno Wolff III
commit ad3a0c5f57656e015d933be48d6904d66cda77b2
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 12:22:55 2013 -0500
Fix up the Makefile
Some more changes are needed, but at least get the simplified
version working.
Makefile | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/Makefile b/Makefile
index 2af940a..6f81545 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,5 @@
-clean: rm -f spin-kickstarts.tar.gz
-dist: git archive --format=tar --prefix=spin-kickstarts | gzip > spin-kickstarts.tar.gz
+clean:
+ rm -f spin-kickstarts.tar.gz
+
+dist:
+ git archive --format=tar --prefix=spin-kickstarts HEAD | gzip > spin-kickstarts.tar.gz
10 years, 10 months
[spin-kickstarts] Switch from using auto tools to just building a new tarball
by Bruno Wolff III
commit 1552a05e2ccb37bd208c0ebc3126ac85f2947000
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 12:15:15 2013 -0500
Switch from using auto tools to just building a new tarball
The previous system required making commits in order to do a new
build. This caused problems because we were using the git repo
directly for fedora builds and we couldn't use that exact version
when building matching packages because of needing to make new
commits in order to do the build.
Having the spec file in here also was unnecessary. It is easy to
just maintain the spec file in the Fedora package.
I still want to do a bit more future work with this to pick up
the version from a git tag.
INSTALL | 302 ---------------------------
Makefile | 2 +
Makefile.am | 194 ------------------
NEWS | 1 -
README | 26 +---
configure.ac | 16 --
install-sh | 520 -----------------------------------------------
missing | 376 ----------------------------------
sources | 2 -
spin-kickstarts.spec.in | 178 ----------------
10 files changed, 3 insertions(+), 1614 deletions(-)
---
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..2af940a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+clean: rm -f spin-kickstarts.tar.gz
+dist: git archive --format=tar --prefix=spin-kickstarts | gzip > spin-kickstarts.tar.gz
diff --git a/README b/README
index a6574f1..ebd9fb5 100644
--- a/README
+++ b/README
@@ -9,36 +9,12 @@ The release specific branches contain spin concepts that:
- are approved (both by Board and Spin SIG)
- maintained for the remainder of the release cycle
-When kickstart files are added or removed, Makefile.am should be updated to
-reflect the change.
-
-To rebuild the srpm for a new version or a new release without patches:
-
git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
cd spin-kickstarts
# If you need a specific branch other than master:
git checkout BRANCHNAME
-# Edit configure.ac to update the version or release
-# Edit spin-kickstarts.spec.in to update the change log
-git commit -a
-git push
-aclocal
-automake
-autoconf
-./configure
make dist
-install -D -m 644 spin-kickstarts-*.tar.gz ~/rpmbuild/SOURCES
-# Edit spin-kickstarts.spec if some changelog history needs to be included
-install -D -m 644 spin-kickstarts.spec ~/rpmbuild/SPECS
-rpmbuild -ba ~/rpmbuild/SPECS/spin-kickstarts.spec
-# If the sprm gets published then publish the tar.gz file on fedorahosted
+# Publish the released tar ball
scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts
# Clean up the generated files:
git clean -f -d
-# To update a branch of spin-kickstarts
-# Make sure the branch is current (git pull)
-# Copy over the new spec file
-# In each branch run make new-sources FILES=/pathto/spin-kickstarts-*.tar.gz
-# Commit the changes with git commit -a
-# Make a new tag with make tag
-# Do the build with make build
10 years, 10 months
Re: [Fedora-spins] RFC 1 - consolidate repo definitions
by Bruno Wolff III
On Tue, May 28, 2013 at 21:50:08 +0000,
Bruno Wolff III <bruno(a)wolff.to> wrote:
>We have about a half dozen ks files with repo commands in them that need
>to be changed when a new branch is split off master. I'd like to change
>this (for f20) to have three repo files. One with branched / released
>definitions, another that has rawhide definitions and a third that
>will include one of the first two (the other commented out) that would be
>included by all of the ks files that currently have repo commands.
This has been completed. fedora-install-fedora.ks is still different
because it uses sources and not updates, but I made some changes there
to make it easier to have it point to rawhide in master and fedora
in non-master branches.
I updated some instructions in the spins SIG wiki related to this.
10 years, 10 months
[spin-kickstarts] We no longer need to exclude btanks
by Bruno Wolff III
commit 3eacd1cee958b5e268a31b84ad486403ecff2390
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 11:44:52 2013 -0500
We no longer need to exclude btanks
btanks is no longer getting pulled into composes by default so we
no longer need to use the exclude to keep it out.
fedora-install-fedora.ks | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 3f661dc..457a64b 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -37,7 +37,6 @@ repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirror
-syslog-ng*
-astronomy-bookmarks
-generic*
--btanks*
-GConf2-dbus*
-bluez-gnome
-java-1.8.0-openjdk
10 years, 10 months
[spin-kickstarts] Start using rawhide repos for the install ks file in master
by Bruno Wolff III
commit 7c2fbd233655f0ccaafeff9b3bf7bfd237a7a33c
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 11:26:11 2013 -0500
Start using rawhide repos for the install ks file in master
Now that the repo commands have been simplfied it makes sense to
use rawhide repos in master and fedora repos in the non-master branches.
fedora-install-fedora.ks | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index f014584..3f661dc 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -10,9 +10,18 @@
#part iso --size=4998
# Add the repos you wish to use to compose here. At least one of them needs group data.
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+
+# In non-master branches the fedora repo commands should be uncommented
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
# Package manifest for the compose. Uses repo group metadata to translate groups.
# (default groups for the configured repos are added by --default)
10 years, 10 months
[spin-kickstarts] Move forced excludes out of repo commands
by Bruno Wolff III
commit 66d1b8d816c85d7ab6b21424e84f2cb4b73317b1
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 11:15:20 2013 -0500
Move forced excludes out of repo commands
Because pungi is an inclusive depsolver we can exclude some packages it
brings in and still get all of what we need. In particular we need to do
this to save space.
At one time only excludes on the repo commands were truly forced. It
had been the case that packages excluded in the %packages section
could still be included to satisfy dependencies. This is no longer the
case.
Doing the excludes in the packages sections allows us to list the
packages just once and it makes overriding the repo commands simpler
since the excludes don't need to be repeated.
fedora-install-fedora.ks | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 2f88d60..f014584 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -10,18 +10,33 @@
#part iso --size=4998
# Add the repos you wish to use to compose here. At least one of them needs group data.
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude kernel-tools* --exclude syslog-ng* --exclude astronomy-bookmarks --exclude generic* --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude java-1.8.0-openjdk --exclude community-mysql* --exclude jruby*
-repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude kernel-tools* --exclude syslog-ng* --exclude astronomy-bookmarks --exclude generic* --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude java-1.8.0-openjdk --exclude community-mysql* --exclude jruby*
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
# Package manifest for the compose. Uses repo group metadata to translate groups.
# (default groups for the configured repos are added by --default)
%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought
+# in to satisify dependencies and we don't always want that. So we use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+-generic*
+-btanks*
+-GConf2-dbus*
+-bluez-gnome
+-java-1.8.0-openjdk
+-community-mysql*
+-jruby*
+
# core
kernel*
--kernel-tools*
--kernel-debug*
--kernel-PAEdebug*
dracut-*
# Desktops
10 years, 10 months
[spin-kickstarts] Make it easier to handle branching
by Bruno Wolff III
commit 8394644034c0298d6727c369957eacd62ea5ccf2
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 08:05:30 2013 -0500
Make it easier to handle branching
Now the switch between using the rawhide repo and the normal repos
can be done by just switching comment lines in one place
(fedora-repo.ks). (Note that the repo lines in fedora-install.ks
don't get changed for branching.)
Makefile.am | 5 ++++-
fedora-aos.ks | 5 +----
fedora-arm-base.ks | 5 +----
fedora-live-base.ks | 5 +----
fedora-repo.ks | 9 +++++++++
5 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4557d2e..13d3972 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,10 @@ fedora_DATA = \
fedora-livedvd-scientific-kde.ks \
fedora-livecd-security.ks \
fedora-live-jam-kde.ks \
- fedora-mate-packages.ks
+ fedora-mate-packages.ks \
+ fedoda-repo-rawhide.ks \
+ fedora-repo-not-rawhide.ks \
+ fedora-repo.ks
customdir = ${pkgdatadir}/custom/
custom_DATA = \
diff --git a/fedoda-repo-rawhide.ks b/fedoda-repo-rawhide.ks
new file mode 100644
index 0000000..e69de29
diff --git a/fedora-aos.ks b/fedora-aos.ks
index 9d93113..c42a916 100644
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -26,10 +26,7 @@ part / --size 1024 --fstype ext4 --ondisk sda
#
# Repositories
#
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+%include fedora-repo.ks
#
# Add all the packages after the base packages
diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index 585c502..a9cf754 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -9,10 +9,7 @@ firstboot --reconfig
services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=network
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+%include fedora-repo.ks
%packages
@core
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index f8f1eea..4d3b129 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -17,10 +17,7 @@ xconfig --startxonboot
part / --size 3072 --fstype ext4
services --enabled=NetworkManager --disabled=network,sshd
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+%include fedora-repo.ks
%packages
@base-x
diff --git a/fedora-repo-not-rawhide.ks b/fedora-repo-not-rawhide.ks
new file mode 100644
index 0000000..e69de29
diff --git a/fedora-repo.ks b/fedora-repo.ks
new file mode 100644
index 0000000..9631967
--- /dev/null
+++ b/fedora-repo.ks
@@ -0,0 +1,9 @@
+# Include the appropriate repo definitions
+
+# Exactly one of the following should be uncommented
+
+# For the master branch the following should be uncommented
+%include fedora-repo-rawhide.ks
+
+# For non-master branches the following should be uncommented
+# %include fedora-repo-non-rawhide.ks
10 years, 10 months
[spin-kickstarts] Fix Makefile.am for missing .ks in file name
by Bruno Wolff III
commit fb103a9edce734c7a65d5d1b02873b3cb7f14043
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Jun 26 09:57:39 2013 -0500
Fix Makefile.am for missing .ks in file name
This also doesn't change anything actually used for the f19 rc2 build.
It does affect being able to build the rpm.
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d014cf9..4557d2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ fedora_DATA = \
fedora-livedvd-scientific-kde.ks \
fedora-livecd-security.ks \
fedora-live-jam-kde.ks \
- fedora-mate-packages
+ fedora-mate-packages.ks
customdir = ${pkgdatadir}/custom/
custom_DATA = \
10 years, 10 months
F19 spins testing
by Dennis Gilmore
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hi all
http://dl.fedoraproject.org/pub/alt/stage/19-RC2/Spins/ contains all
spins for f19 we need to get at least two people signing off that they
have tested each one.
the Jam-KDE spin failed to compose on 64bit due to a multilib issue.
lives are not to be multilibed.
Scientific-KDE failed to compose due to packages it wants not existing
Please test and report back
Dennis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEARECAAYFAlHKUsgACgkQkSxm47BaWfcJ/gCgwnXWw0zpG773viUGLI6Pjyta
0F4An1isiYoj6rQnFGExIQQB8L/q1Hax
=0Yoz
-----END PGP SIGNATURE-----
10 years, 10 months
Re: [Fedora-spins] F19 spins testing
by Ian Malone
>On 06/28/2013 11:07 AM, Brendan Jones wrote:
>> On 06/26/2013 04:32 AM, Dennis Gilmore wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> hi all
>>>
>>> http://dl.fedoraproject.org/pub/alt/stage/19-RC2/Spins/ contains all
>>> spins for f19 we need to get at least two people signing off that they
>>> have tested each one.
>>>
>>> the Jam-KDE spin failed to compose on 64bit due to a multilib issue.
>>> lives are not to be multilibed.
>>>
>>> Scientific-KDE failed to compose due to packages it wants not existing
>>>
>>>
>>>
>>> Please test and report back
>>>
>>
>> I have tested the latest RC3 Jam spin both Live and install to harddrive
>> with no issues.
>>
>Another +1 from a member of our SIG for the latest RC3, thanks.
+2 for RC3 Jam, tested Live on hardware and install in VM.
--
imalone
http://ibmalone.blogspot.co.uk
10 years, 10 months
