diff options
| author | Luya Tshimbalanga <luya@fedoraproject.org> | 2013-08-11 19:49:17 -0700 |
|---|---|---|
| committer | Luya Tshimbalanga <luya@fedoraproject.org> | 2013-08-11 19:49:17 -0700 |
| commit | 8c702acbc596e01afda43bcbc044e64ad0829d66 (patch) | |
| tree | 01703748d831542174c92fd3798a839eb39e10c1 | |
| parent | 4f4d1d082a13fb31675a1f31ac87c5371d41fe68 (diff) | |
| parent | a47186bb673789cb3ba6bae8af26bf0a86b7dcac (diff) | |
| download | spin-kickstarts-8c702acbc596e01afda43bcbc044e64ad0829d66.tar.gz spin-kickstarts-8c702acbc596e01afda43bcbc044e64ad0829d66.tar.xz spin-kickstarts-8c702acbc596e01afda43bcbc044e64ad0829d66.zip | |
Design: custom menu and addtional packages
52 files changed, 459 insertions, 1732 deletions
diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 2550dab..0000000 --- a/INSTALL +++ /dev/null @@ -1,302 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 6. Often, you can also type `make uninstall' to remove the installed - files again. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ca8011b --- /dev/null +++ b/Makefile @@ -0,0 +1,38 @@ +# Get the version name first by seeing if HEAD is tagged +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) +endif + +DESTDIR := /usr + +DATADIR := $(DESTDIR)/share + +DOCDIR := $(DATADIR)/doc + +name := spin-kickstarts + +all: dist + +install: + 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 + +clean: + rm -f $(name)-*.tar.gz + +dist: $(name)-$(version).tar.gz + +$(name)-$(version).tar.gz: + git archive --format=tar --prefix=$(name)-$(version)/ HEAD | gzip > $(name)-$(version).tar.gz + +publish: $(name)-$(version).tar.gz + scp $(name)-$(version).tar.gz fedorahosted.org:$(name) + +dist-clean: + git clean -f -d diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 3864a65..0000000 --- a/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -# Automake Automagic - -fedoradir = $(pkgdatadir)/ -fedora_DATA = \ - fedora-aos.ks \ - fedora-arm-base.ks \ - fedora-arm-minimal.ks \ - fedora-arm-xfce.ks \ - fedora-arm-lxde.ks \ - fedora-arm-xbase.ks \ - fedora-install-fedora.ks \ - fedora-live-base.ks \ - fedora-live-minimization.ks \ - fedora-live-desktop.ks \ - fedora-livecd-desktop.ks \ - fedora-live-design-suite.ks \ - fedora-live-kde.ks \ - fedora-livecd-kde.ks \ - fedora-live-kde-base.ks \ - fedora-livecd-lxde.ks \ - fedora-lxde-packages.ks \ - fedora-livecd-mate-compiz.ks \ - fedora-live-mate-compiz.ks \ - fedora-livecd-soas.ks \ - fedora-soas-packages.ks \ - fedora-livecd-xfce.ks \ - fedora-xfce-packages.ks \ - fedora-livedvd-electronic-lab.ks \ - fedora-livedvd-games.ks \ - fedora-livedvd-robotics.ks \ - fedora-livedvd-scientific-kde.ks \ - fedora-livecd-security.ks \ - fedora-live-jam-kde.ks - -customdir = ${pkgdatadir}/custom/ -custom_DATA = \ - custom/README \ - custom/fedora-livedvd-haskell.ks \ - custom/qa-test-day.ks - -l10ndir = ${pkgdatadir}/l10n/ -l10n_DATA = \ - l10n/README \ - l10n/fedora-livecd-desktop-de_CH.ks \ - l10n/fedora-livecd-desktop-de_DE.ks \ - l10n/fedora-livecd-desktop-fr_FR.ks \ - l10n/fedora-livecd-desktop-nl_NL.ks \ - l10n/fedora-livecd-desktop-pt_BR.ks \ - l10n/fedora-livecd-desktop-pt_PT.ks \ - l10n/fedora-livecd-desktop-ru_RU.ks \ - l10n/fedora-livecd-kde-de_CH.ks \ - l10n/fedora-livecd-kde-de_DE.ks \ - l10n/fedora-livecd-kde-fr_FR.ks \ - l10n/fedora-livecd-kde-nl_NL.ks \ - l10n/fedora-livecd-kde-pt_PT.ks \ - l10n/fedora-livecd-kde-ru_RU.ks \ - l10n/fedora-livecd-lxde-de_CH.ks \ - l10n/fedora-livecd-lxde-de_DE.ks \ - l10n/fedora-livecd-lxde-fr_FR.ks \ - l10n/fedora-livecd-lxde-ru_RU.ks \ - l10n/fedora-livecd-xfce-de_CH.ks \ - l10n/fedora-livecd-xfce-de_DE.ks \ - l10n/fedora-livecd-xfce-fr_FR.ks \ - l10n/fedora-livecd-xfce-nl_NL.ks \ - l10n/fedora-livecd-xfce-pt_PT.ks \ - l10n/fedora-livecd-xfce-ru_RU.ks \ - l10n/fedora-livedvd-electronic-lab-de_CH.ks \ - l10n/fedora-livedvd-electronic-lab-de_DE.ks \ - l10n/fedora-livedvd-electronic-lab-nl_NL.ks \ - l10n/fedora-livedvd-electronic-lab-pt_PT.ks \ - l10n/fedora-livedvd-electronic-lab-ru_RU.ks \ - l10n/fedora-livedvd-games-de_CH.ks \ - l10n/fedora-livedvd-games-de_DE.ks \ - l10n/fedora-livedvd-games-nl_NL.ks \ - l10n/fedora-livedvd-games-pt_PT.ks \ - l10n/fedora-livedvd-games-ru_RU.ks - -EXTRA_DIST = \ - $(fedora_DATA) \ - $(custom_DATA) \ - $(l10n_DATA) \ - spin-kickstarts.spec.in\ - spin-kickstarts.spec \ - ChangeLog \ - COPYING \ - AUTHORS \ - README - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - -install-exec-local: - -uninstall-local: - rm -rf $(DESTDIR)$(pkgdatadir) - -clean: - rm -f ChangeLog - rm -f *~ - rm -f spin-kickstarts.spec - rm -f config.status config.log - rm -rf autom4te.cache/ - find -type f -name "Makefile" -exec rm -f {} \; - find -type f -name "*.rpmnew" -exec rm -f {} \; - find -type f -name "*.rpmsave" -exec rm -f {} \; - find -type f -name "Makefile.in" -exec rm -f {} \; - find -type f -name "*.log" -exec rm -f {} \; - find -type f -name "spin-kickstarts-*.tar.gz" -exec mv -f {} .. \; - rm -f aclocal.m4 configure - -ChangeLog: - (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) - -rpm: ChangeLog dist - @(rpmbuild -ta ${PACKAGE}-$(PACKAGE_VERSION).tar.gz) - -srpm: ChangeLog dist - @(rpmbuild -ts ${PACKAGE}-$(PACKAGE_VERSION).tar.gz) - -CVS_PKGVERSION=`echo $(PACKAGE_VERSION) | sed -e 's/\./_/g'` -CVSTAG=$(PACKAGE_NAME)-$(CVS_PACKAGEVERSION) -tag: - @cvs tag -F $(CVSTAG) - -RELEASE=`rpm -q --qf="%{RELEASE}\n" --specfile ${PACKAGE}.spec | head -n 1` - -F-7: srpm - @(mock -v -r fedora-7-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) - -F-8: srpm - @(mock -v -r fedora-8-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) - -F-9: srpm - @(mock -v -r fedora-9-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) - -devel: srpm - @(mock -v -r fedora-devel-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) - -EL-5: srpm - @(mock -v -r epel-5-i386 rebuild ~/rpmbuild/SRPMS/${PACKAGE}-$(PACKAGE_VERSION)-$(RELEASE).src.rpm) - -mock: srpm F-7 F-8 F-9 devel EL-5 - -RELEASE_NUM=`rpm -q --qf="%{RELEASE}\n" --specfile ${PACKAGE}.spec | head -n 1 | cut -d'.' -f 1` - -fpeople: mock - rm -rf public_html - mkdir -p public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/{el5,fc7,fc8,fc9} - cp ${PACKAGE}-$(PACKAGE_VERSION).tar.gz public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/. - cp ${PACKAGE}.spec public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/. - cp /var/lib/mock/epel-5-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/el5/. - cp /var/lib/mock/fedora-7-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/fc7/. - cp /var/lib/mock/fedora-8-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/fc8/. - cp /var/lib/mock/fedora-development-i386/result/* public_html/${PACKAGE}/$(PACKAGE_VERSION)-$(RELEASE_NUM)/fc9/. - scp -r public_html fedorapeople.org:. - -custom: mock - rm -rf custom - mkdir -p custom/{el5,f7,f8,f9}/{i386,x86_64,ppc,SRPMS}/ - cp /var/lib/mock/epel-5-i386/result/*.noarch.rpm custom/el5/i386/. - cp /var/lib/mock/epel-5-i386/result/*.noarch.rpm custom/el5/x86_64/. - cp /var/lib/mock/epel-5-i386/result/*.noarch.rpm custom/el5/ppc/. - cp /var/lib/mock/epel-5-i386/result/*.src.rpm custom/el5/SRPMS/. - cp /var/lib/mock/fedora-7-i386/result/*.noarch.rpm custom/f7/i386/. - cp /var/lib/mock/fedora-7-i386/result/*.noarch.rpm custom/f7/x86_64/. - cp /var/lib/mock/fedora-7-i386/result/*.noarch.rpm custom/f7/ppc/. - cp /var/lib/mock/fedora-7-i386/result/*.src.rpm custom/f7/SRPMS/. - cp /var/lib/mock/fedora-8-i386/result/*.noarch.rpm custom/f8/i386/. - cp /var/lib/mock/fedora-8-i386/result/*.noarch.rpm custom/f8/x86_64/. - cp /var/lib/mock/fedora-8-i386/result/*.noarch.rpm custom/f8/ppc/. - cp /var/lib/mock/fedora-8-i386/result/*.src.rpm custom/f8/SRPMS/. - cp /var/lib/mock/fedora-development-i386/result/*.noarch.rpm custom/f9/i386/. - cp /var/lib/mock/fedora-development-i386/result/*.noarch.rpm custom/f9/x86_64/. - cp /var/lib/mock/fedora-development-i386/result/*.noarch.rpm custom/f9/ppc/. - cp /var/lib/mock/fedora-development-i386/result/*.src.rpm custom/f9/SRPMS/. - scp -r custom elwood.kanarip.com:/data/os/repos/. @@ -1 +0,0 @@ -Most news is on http://fedorahosted.org/spin-kickstarts @@ -9,36 +9,15 @@ 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 -scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts +# No tag has been added yet tag HEAD with +git tag VERSION +git push --tags +make +# Publish the released tar ball +make publish # 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 +make clean diff --git a/configure.ac b/configure.ac deleted file mode 100644 index aebe8a5..0000000 --- a/configure.ac +++ /dev/null @@ -1,16 +0,0 @@ -AC_INIT([spin-kickstarts], 0.20.4) -AC_SUBST([RELEASE], 1) - -ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW" - -AM_INIT_AUTOMAKE -AM_MAINTAINER_MODE - -AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`) - -AC_CONFIG_FILES([ -Makefile -spin-kickstarts.spec -]) - -AC_OUTPUT 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 072246c..541f76e 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -4,16 +4,12 @@ auth --useshadow --enablemd5 selinux --enforcing firewall --enabled --service=mdns,ssh -bootloader --location=none -part /boot --size=512 --fstype ext3 -part swap --size=512 --fstype swap -part / --grow --size=6500 --fstype ext4 +# make sure that initial-setup runs and lets us do all the configuration bits +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 @@ -27,6 +23,20 @@ kernel-lpae chrony arm-boot-config initial-setup +#lets resize / on first boot +dracut-modules-growroot + +# install uboot images +uboot-beagle +uboot-beaglebone +uboot-origen +uboot-panda +uboot-smdkv310 +uboot-uevm +uboot-wandboard_dl +uboot-wandboard_solo +uboot-wandboard_quad + %end %post diff --git a/fedora-arm-desktop-vfat.ks b/fedora-arm-desktop-vfat.ks new file mode 100644 index 0000000..2c3c7cb --- /dev/null +++ b/fedora-arm-desktop-vfat.ks @@ -0,0 +1,10 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-desktop-packages.ks +%include fedora-arm-vfat-partitioning.ks + +%packages +-initial-setup + +%end + diff --git a/fedora-arm-desktop.ks b/fedora-arm-desktop.ks new file mode 100644 index 0000000..306f645 --- /dev/null +++ b/fedora-arm-desktop.ks @@ -0,0 +1,10 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-desktop-packages.ks +%include fedora-arm-partitioning.ks + +%packages +-initial-setup + +%end + diff --git a/fedora-arm-kde-vfat.ks b/fedora-arm-kde-vfat.ks new file mode 100644 index 0000000..ba4504d --- /dev/null +++ b/fedora-arm-kde-vfat.ks @@ -0,0 +1,11 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-kde-packages.ks +%include fedora-arm-vfat-partitioning.ks + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks new file mode 100644 index 0000000..c1b612c --- /dev/null +++ b/fedora-arm-kde.ks @@ -0,0 +1,13 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-kde-packages.ks +%include fedora-arm-partitioning.ks + +part / --size=3400 --fstype ext4 + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-lxde-vfat.ks b/fedora-arm-lxde-vfat.ks new file mode 100644 index 0000000..3c18eac --- /dev/null +++ b/fedora-arm-lxde-vfat.ks @@ -0,0 +1,11 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-lxde-packages.ks +%include fedora-arm-vfat-partitioning.ks + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks index 28a4a74..d0804ea 100644 --- a/fedora-arm-lxde.ks +++ b/fedora-arm-lxde.ks @@ -1,6 +1,7 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-lxde-packages.ks +%include fedora-arm-partitioning.ks %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-arm-mate-vfat.ks b/fedora-arm-mate-vfat.ks new file mode 100644 index 0000000..18d3ea4 --- /dev/null +++ b/fedora-arm-mate-vfat.ks @@ -0,0 +1,13 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-mate-packages.ks +%include fedora-arm-vfat-partitioning.ks + +part / --size=4000 --fstype ext4 + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks new file mode 100644 index 0000000..f60e333 --- /dev/null +++ b/fedora-arm-mate.ks @@ -0,0 +1,13 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-mate-packages.ks +%include fedora-arm-partitioning.ks + +part / --size=4000 --fstype ext4 + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-minimal-vfat.ks b/fedora-arm-minimal-vfat.ks new file mode 100644 index 0000000..2f7f2dd --- /dev/null +++ b/fedora-arm-minimal-vfat.ks @@ -0,0 +1,17 @@ +%include fedora-arm-base.ks +%include fedora-arm-vfat-partitioning.ks + +%post + +# setup systemd to boot to the right runlevel +echo -n "Setting default runlevel to multiuser text mode" +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +echo -n "Enabling initial-setup text mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service +echo . + +%end + diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index 588ee40..8ed64eb 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,5 +1,5 @@ %include fedora-arm-base.ks - +%include fedora-arm-partitioning.ks %post diff --git a/fedora-arm-partitioning.ks b/fedora-arm-partitioning.ks new file mode 100644 index 0000000..cb48086 --- /dev/null +++ b/fedora-arm-partitioning.ks @@ -0,0 +1,5 @@ +bootloader --location=none +part /boot --size=512 --fstype ext3 +part swap --size=512 --fstype swap +part / --size=3000 --fstype ext4 + diff --git a/fedora-arm-soas-vfat.ks b/fedora-arm-soas-vfat.ks new file mode 100644 index 0000000..d736cb5 --- /dev/null +++ b/fedora-arm-soas-vfat.ks @@ -0,0 +1,11 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-soas-packages.ks +%include fedora-arm-vfat-partitioning.ks + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks new file mode 100644 index 0000000..dc69b9c --- /dev/null +++ b/fedora-arm-soas.ks @@ -0,0 +1,11 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-soas-packages.ks +%include fedora-arm-partitioning.ks + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-vfat-partitioning.ks b/fedora-arm-vfat-partitioning.ks new file mode 100644 index 0000000..21968a7 --- /dev/null +++ b/fedora-arm-vfat-partitioning.ks @@ -0,0 +1,5 @@ +bootloader --location=none +part /boot/uboot --size=20 --fstype vfat +part swap --size=512 --fstype swap +part / --size=3400 --fstype ext4 + diff --git a/fedora-arm-xbase.ks b/fedora-arm-xbase.ks index 2c4b513..aec2872 100644 --- a/fedora-arm-xbase.ks +++ b/fedora-arm-xbase.ks @@ -5,3 +5,16 @@ @multimedia @printing %end + +%post +# X on arm does not detect the driver needed correctly so we need a snippet to set something +# using fbdev as the lowest common denominator. + +cat > /etc/X11/xorg.conf.d/fbdev.conf <<EOF +Section "Device" + Identifier "Display" + Driver "fbdev" +EndSection +EOF + +%end diff --git a/fedora-arm-xfce-vfat.ks b/fedora-arm-xfce-vfat.ks new file mode 100644 index 0000000..ba42ac7 --- /dev/null +++ b/fedora-arm-xfce-vfat.ks @@ -0,0 +1,11 @@ +%include fedora-arm-base.ks +%include fedora-arm-xbase.ks +%include fedora-xfce-packages.ks +%include fedora-arm-vfat-partitioning.ks + +%post +echo -n "Enabling initial-setup gui mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service +echo . + +%end diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks index 5923c6b..7594d9f 100644 --- a/fedora-arm-xfce.ks +++ b/fedora-arm-xfce.ks @@ -1,6 +1,7 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks %include fedora-xfce-packages.ks +%include fedora-arm-partitioning.ks %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-desktop-packages.ks b/fedora-desktop-packages.ks new file mode 100644 index 0000000..6223d0f --- /dev/null +++ b/fedora-desktop-packages.ks @@ -0,0 +1,26 @@ +%packages +@firefox +@gnome-desktop +@libreoffice + +# FIXME; apparently the glibc maintainers dislike this, but it got put into the +# desktop image at some point. We won't touch this one for now. +nss-mdns + +# This one needs to be kicked out of @standard +-smartmontools + +# We use gnome-control-center's printer and input sources panels instead +-system-config-printer +-im-chooser + +# There's been some debate about removing sendmail from @standard, but it's +# being punted for now. At least we can fix it in the desktop spin. +# Similarly, there was also some debate about removing rsyslog from @standard +# (since much of its functionality is provided by journald now), but it's +# not going to happen for f20 either, so drop it here for now. +# https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html +-sendmail +-rsyslog + +%end diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks index 51bd560..35996eb 100644 --- a/fedora-install-fedora.ks +++ b/fedora-install-fedora.ks @@ -10,18 +10,43 @@ #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* +# 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) -%packages --default +# @base got renamed to @standard, but @base is still included by default by pungi. +%packages --default --nobase + +# 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* +-GConf2-dbus* +-bluez-gnome +# Periods cause problems in paterns, so replace with *s +-java-1*8*0-openjdk +-community-mysql* +-jruby* + # core kernel* --kernel-tools* --kernel-debug* --kernel-PAEdebug* dracut-* # Desktops @@ -38,6 +63,8 @@ dracut-* @multimedia @hardware-support @printing +@admin-tools +@basic-desktop ## GNOME @firefox diff --git a/fedora-kde-packages.ks b/fedora-kde-packages.ks new file mode 100644 index 0000000..41ac1c7 --- /dev/null +++ b/fedora-kde-packages.ks @@ -0,0 +1,19 @@ +%packages +@kde-apps +@kde-desktop +@kde-media +@kde-telepathy + +### The KDE-Desktop + +### fixes + +# use kde-print-manager instead of system-config-printer +-system-config-printer +# make sure mariadb lands instead of MySQL (hopefully a temporary hack) +mariadb-embedded +mariadb-libs +mariadb-server + +%end + diff --git a/fedora-live-base.ks b/fedora-live-base.ks index f8f1eea..6c76e96 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 @@ -80,8 +77,6 @@ exists() { \$* } -touch /.liveimg-configured - # Make sure we don't mangle the hardware clock on shutdown ln -sf /dev/null /etc/systemd/system/hwclock-save.service @@ -292,6 +287,9 @@ rm -f /boot/initramfs* # make sure there aren't core files lying around rm -f /core* +# Mark things as configured +touch /.liveimg-configured + # convince readahead not to collect # FIXME: for systemd diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks index 89382e4..f453da5 100644 --- a/fedora-live-design-suite.ks +++ b/fedora-live-design-suite.ks @@ -4,7 +4,7 @@ # - A Spin targeted towards professional designers # Website: http://fedoraproject.org/wiki/Design_Suite # Maintainers: -# - Luya Tshimbalanga <sdz AT fedoraproject DOT org> +# - Luya Tshimbalanga <luya AT fedoraproject DOT org> # - Previous maintainer Sebastian Dziallas %include fedora-live-desktop.ks @@ -17,7 +17,11 @@ part / --size 8192 # graphics blender bluefish +<<<<<<< HEAD #cinepaint +======= +#cinepaint will be orphaned soon +>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac cmyktool darktable dia @@ -37,6 +41,10 @@ mypaint inkscape nautilus-image-converter optipng +<<<<<<< HEAD +======= +pencil +>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac scribus colord-extra-profiles synfigstudio @@ -53,10 +61,6 @@ filezilla audacity pitivi -# system -# gtk-recordmydesktop # dropped for space (#887991) -# network-manager-applet #part of Gnome Desktop - # fonts aajohan-comfortaa-fonts adobe-source-sans-pro-fonts @@ -92,6 +96,7 @@ overpass-fonts %end %post +<<<<<<< HEAD #Override the favorite desktop application in Dash cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE [org.gnome.shell] @@ -99,6 +104,15 @@ favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp #Enable categories in Gnome Shell app-folder-categories=['Utilities', 'Others', 'System Settings', 'Sundry', 'Graphics', 'Games', 'Office', 'Multimedia', 'Network', 'Internet'] FOE +======= + +# Set favourite apps for Design Suite +cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE +[org.gnome.shell] +favorite-apps=['firefox.desktop', 'evolution.desktop', 'gimp.desktop', 'shotwell.desktop', 'inkscape.desktop', 'scribus.desktop', 'blender.desktop', 'nautilus.desktop', 'anaconda.desktop'] +FOE + +>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac # Add link to the Inkscape Course cat >> /usr/share/applications/inkscape-course.desktop << FOE @@ -113,10 +127,15 @@ Categories=Graphics;Documentation; FOE chmod a+x /usr/share/applications/inkscape-course.desktop +<<<<<<< HEAD # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas EOF %end +======= +EOF +>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac +%end diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks index 6bfd535..0108c6b 100644 --- a/fedora-live-desktop.ks +++ b/fedora-live-desktop.ks @@ -3,27 +3,10 @@ # mailto:desktop@lists.fedoraproject.org %include fedora-live-base.ks +%include fedora-desktop-packages.ks part / --size 4096 -%packages -@firefox -@gnome-desktop -@libreoffice - -# FIXME; apparently the glibc maintainers dislike this, but it got put into the -# desktop image at some point. We won't touch this one for now. -nss-mdns - -# This one needs to be kicked out of @standard --smartmontools - -# We use gnome-control-center's printer and input sources panels instead --system-config-printer --im-chooser - -%end - %post cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-live-jam-kde.ks b/fedora-live-jam-kde.ks index 78f39d0..9ea1612 100644 --- a/fedora-live-jam-kde.ks +++ b/fedora-live-jam-kde.ks @@ -10,7 +10,6 @@ # Maintainer: Jørn Lomax <northlomax@gmail.com> # https://fedoraproject.org/wiki/User:jvlomax # Brendan Jones <brendan.jones.it@gmail.com> -# Last modified: Dec 20, 2012. %include fedora-livecd-kde.ks @@ -86,7 +85,6 @@ non-session-manager # audio-plugins calf dssi -dssi-vst jack-rack ladspa @@ -118,7 +116,7 @@ lv2-c++-tools lv2-samplv1 lv2-synthv1 lv2-drumkv1 -slv2 + #dssi nekobee-dssi @@ -191,7 +189,7 @@ thunderbird #setup kickoff favorites /bin/mkdir -p /etc/skel/.kde/share/config -JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/fedora-qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop +JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES cat <<EOF >> /etc/skel/.kde/share/config/kickoffrc diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 293123e..3bbd023 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -3,26 +3,7 @@ # mailto:kde@lists.fedoraproject.org %include fedora-live-base.ks - -%packages -@kde-apps -@kde-desktop -@kde-media -@kde-telepathy - -### The KDE-Desktop - -### fixes - -# use kde-print-manager instead of system-config-printer --system-config-printer -# make sure mariadb lands instead of MySQL (hopefully a temporary hack) -mariadb-embedded -mariadb-libs -mariadb-server - -%end - +%include fedora-kde-packages.ks %post diff --git a/fedora-live-mate-compiz.ks b/fedora-live-mate-compiz.ks index a53d9ae..682181d 100644 --- a/fedora-live-mate-compiz.ks +++ b/fedora-live-mate-compiz.ks @@ -3,40 +3,10 @@ # mailto:desktop@lists.fedoraproject.org %include fedora-live-base.ks +%include fedora-mate-packages.ks part / --size 4096 -%packages --realmd # only seems to be used in GNOME --PackageKit* # we switched to yumex, so we don't need this -firefox -@mate -compiz -compiz-plugins-main -compiz-plugins-extra -compiz-manager -compizconfig-python -compiz-plugins-unsupported -compiz-bcop -compiz-mate -libcompizconfig -compiz-plugins-main -ccsm -emerald-themes -emerald -fusion-icon -fusion-icon-gtk -@libreoffice - -# FIXME; apparently the glibc maintainers dislike this, but it got put into the -# desktop image at some point. We won't touch this one for now. -nss-mdns - -# This one needs to be kicked out of @standard --smartmontools - -%end - %post cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index d71efbc..9187028 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -7,8 +7,17 @@ %include fedora-live-minimization.ks %packages -# First, no office +# reduce the office suite in size -planner +-libreoffice-xsltfilter +-libreoffice-pyuno +-libreoffice-emailmerge +-libreoffice-math + +# remove input method things we don't need +-ibus-typing-booster +-imsettings +-imsettings-gsettings # Drop the Java plugin -icedtea-web @@ -30,20 +39,13 @@ -man-pages* -words -# Help and art can be big, too --gnome-user-docs +# Help and art and fonts can be big, too -evolution-help -desktop-backgrounds-basic -*backgrounds-extras -stix-fonts --ibus-typing-booster - -# Sadly, no space for games --aisleriot -# ... or xslt filters --libreoffice-xsltfilter -# Legacy cmdline things we don't want +# Legacy and cmdline things we don't want -krb5-auth-dialog -krb5-workstation -pam_krb5 @@ -64,6 +66,11 @@ -rpcbind -acpid -ntsysv +-rmt +-talk +-lftp +-tcpdump +-dump # Drop some system-config things -system-config-boot @@ -72,6 +79,22 @@ -system-config-services -policycoreutils-gui +# These things are cut purely for space reasons +-aisleriot +-brasero +-brasero-nautilus +-bijiben +-gnome-system-log +-deja-dup +-eog +-gnu-free-mono-fonts +-gnu-free-sans-fonts +-gnu-free-serif-fonts + +# Without gnu freefonts, the lack of Malayalam coverage is +# a problem in anaconda (#977764) +lohit-malayalam-fonts + %end %post diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index aa61d2d..3b93415 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -43,8 +43,35 @@ sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.d mkdir /home/liveuser/Desktop cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -# Add autostart for parcellite -cp /usr/share/applications/fedora-parcellite.desktop /etc/xdg/autostart +# create default config for clipit, otherwise it displays a dialog on startup +mkdir -p /home/liveuser/.config/clipit +cat .config/clipit/clipitrc << FOE +[rc] +use_copy=true +use_primary=false +synchronize=false +automatic_paste=false +show_indexes=false +save_uris=true +use_rmb_menu=false +save_history=false +history_limit=50 +items_menu=20 +statics_show=true +statics_items=10 +hyperlinks_only=false +confirm_clear=false +single_line=true +reverse_history=false +item_length=50 +ellipsize=2 +history_key=<Ctrl><Alt>H +actions_key=<Ctrl><Alt>A +menu_key=<Ctrl><Alt>P +search_key=<Ctrl><Alt>F +offline_key=<Ctrl><Alt>O +offline_mode=false +FOE # this goes at the end after all other changes. chown -R liveuser:liveuser /home/liveuser diff --git a/fedora-livecd-mate-compiz.ks b/fedora-livecd-mate-compiz.ks index 2812b37..fcf8c1c 100644 --- a/fedora-livecd-mate-compiz.ks +++ b/fedora-livecd-mate-compiz.ks @@ -57,7 +57,6 @@ midori -mtr -pinfo -rsh --telnet -nfs-utils -ypbind -yp-tools diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks index 4eb3acd..40e52fc 100644 --- a/fedora-livecd-security.ks +++ b/fedora-livecd-security.ks @@ -118,7 +118,6 @@ ssmtp # drop some system-config things -system-config-boot #-system-config-language --system-config-lvm -system-config-rootpassword #-system-config-services -policycoreutils-gui diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks index 34ba6b9..a65de4e 100644 --- a/fedora-livecd-soas.ks +++ b/fedora-livecd-soas.ks @@ -26,8 +26,8 @@ rm -f /var/lib/rpm/__db* # Get proper release naming in the control panel cat >> /boot/olpc_build << EOF -Sugar on a Stick 8 ('Ōhelo Berry) -Fedora release 18 (Spherical Cow) +Sugar on a Stick 10 (Unknown) +Fedora release 20 (Rawhide) EOF # Add our activities to the favorites @@ -65,13 +65,15 @@ vu.lux.olpc.Maze vu.lux.olpc.Speak EOF -# set up auto-login -cat > /etc/gdm/custom.conf << EOF -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser +cat > /etc/sysconfig/desktop <<EOF +PREFERRED=/usr/bin/sugar +DISPLAYMANAGER=/usr/sbin/lightdm EOF +# set up lightdm autologin +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf + # Don't use the default system user (in SoaS liveuser) as nick name gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks index 310e398..097f938 100644 --- a/fedora-livedvd-games.ks +++ b/fedora-livedvd-games.ks @@ -4,7 +4,7 @@ # - Bruno Wolff III <bruno@wolff.to> # - Formerly maintained by Rahul Sundaram -%include fedora-livecd-desktop.ks +%include fedora-livecd-xfce.ks # The recommended part size for DVDs is too close to use for the games spin part / --size 10240 @@ -91,7 +91,6 @@ lordsawar lure machineball nethack -openlierox pachi pioneers quarry @@ -187,7 +186,6 @@ games-menus # No compilations of games as I want to only include games that at least # someone thought were good within a genre. -kdegames --gnome-games # Nothing should be downloading data to play. -autodownloader diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index 8bb659e..e23befa 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -54,7 +54,6 @@ rkward qtoctave # IDEs for the IDE folks -netbeans eclipse spyder @@ -63,7 +62,7 @@ emacs emacs-color-theme vim scribus -scite +#scite lyx kile diff --git a/fedora-lxde-packages.ks b/fedora-lxde-packages.ks index 889cf0a..5c5df82 100644 --- a/fedora-lxde-packages.ks +++ b/fedora-lxde-packages.ks @@ -42,17 +42,25 @@ metacity ssmtp # save some space +-autofs -acpid +-gimp-help +-desktop-backgrounds-basic +-realmd # only seems to be used in GNOME +-PackageKit* # we switched to yumex, so we don't need this -foomatic-db-ppds -foomatic -stix-fonts -ibus-typing-booster +-xscreensaver-extras +-wqy-zenhei-fonts +# FIXME: can be removed once mtpaint is gone from lxde-apps in comps +-mtpaint # drop some system-config things -system-config-boot #-system-config-language --system-config-lvm -system-config-network -system-config-rootpassword #-system-config-services diff --git a/fedora-mate-packages.ks b/fedora-mate-packages.ks new file mode 100644 index 0000000..0ae5b14 --- /dev/null +++ b/fedora-mate-packages.ks @@ -0,0 +1,29 @@ +%packages +-realmd # only seems to be used in GNOME +-PackageKit* # we switched to yumex, so we don't need this +firefox +@mate +compiz +compiz-plugins-main +compiz-plugins-extra +compiz-manager +compizconfig-python +compiz-plugins-unsupported +compiz-bcop +compiz-mate +libcompizconfig +compiz-plugins-main +ccsm +emerald-themes +emerald +fusion-icon +fusion-icon-gtk +@libreoffice + +# FIXME; apparently the glibc maintainers dislike this, but it got put into the +# desktop image at some point. We won't touch this one for now. +nss-mdns + +# This one needs to be kicked out of @standard +-smartmontools +%end diff --git a/fedora-repo-not-rawhide.ks b/fedora-repo-not-rawhide.ks new file mode 100644 index 0000000..75f87cb --- /dev/null +++ b/fedora-repo-not-rawhide.ks @@ -0,0 +1,3 @@ +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-$releasever&arch=$basearch +#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-$releasever&arch=$basearch diff --git a/fedora-repo-rawhide.ks b/fedora-repo-rawhide.ks new file mode 100644 index 0000000..464cb96 --- /dev/null +++ b/fedora-repo-rawhide.ks @@ -0,0 +1 @@ +repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch 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 diff --git a/fedora-soas-packages.ks b/fedora-soas-packages.ks index 27c2cfd..8ae69b6 100644 --- a/fedora-soas-packages.ks +++ b/fedora-soas-packages.ks @@ -29,9 +29,12 @@ -libfprint -realmd -eekboard-libs +-open-vm-tools* # == Core Sugar Platform == @sugar-desktop +-sugar-ruler +sugar-cp-updater # Write breaks unless we do this (we don't need it anyway) # enable for testing in the F17 dev cycle diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks index 28c3956..6a2f9c6 100644 --- a/fedora-xfce-packages.ks +++ b/fedora-xfce-packages.ks @@ -39,7 +39,6 @@ gnome-keyring-pam # drop some system-config things -system-config-boot --system-config-lvm -system-config-network -system-config-rootpassword #-system-config-services diff --git a/install-sh b/install-sh deleted file mode 100755 index 6781b98..0000000 --- a/install-sh +++ /dev/null @@ -1,520 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2009-04-28.21; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/missing b/missing deleted file mode 100755 index 28055d2..0000000 --- a/missing +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to <bug-automake@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/sources b/sources deleted file mode 100644 index 1cc96c3..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -61665e7b01100c0f8370f3e1fd55d29e spin-kickstarts-0.19.1.tar.gz -72fb4e6e11580322c1bf6cbc29517a0d spin-kickstarts-0.19.2.tar.gz diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in deleted file mode 100644 index c0812fd..0000000 --- a/spin-kickstarts.spec.in +++ /dev/null @@ -1,178 +0,0 @@ -Name: spin-kickstarts -Version: @VERSION@ -Release: @RELEASE@%{?dist} -License: GPLv2+ -Summary: Kickstart files and templates for creating your own Fedora Spins -Group: Applications/System -URL: http://fedorahosted.org/spin-kickstarts -Source0: http://fedorahosted.org/releases/s/p/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch -Requires: fedora-kickstarts - -%description -A number of kickstarts you can use to create customized (Fedora) Spins - -%package -n fedora-kickstarts -Summary: Official Fedora Spins -Group: Applications/System -Requires: spin-kickstarts = %{version}-%{release} - -%description -n fedora-kickstarts -Kickstarts used to compose the official Fedora Spins (see -http://spins.fedoraproject.org/ for a full list) - -%package -n custom-kickstarts -Summary: Kickstart files for Custom Spins (not official) -Group: Applications/System -Requires: spin-kickstarts = %{version}-%{release} -Requires: fedora-kickstarts = %{version}-%{release} - -%description -n custom-kickstarts -Unofficial spins (remixes) brought to us by several contributors - -%package -n l10n-kickstarts -Summary: Localized kickstarts for localized spins -Group: Applications/System -Requires: fedora-kickstarts = %{version}-%{release} -Requires: custom-kickstarts = %{version}-%{release} - -%description -n l10n-kickstarts -Localized versions of kickstarts for localized spins - -%prep -%setup -q - -%build -%configure -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc COPYING README AUTHORS NEWS -%dir %{_datadir}/%{name}/ - -%files -n fedora-kickstarts -%defattr(-,root,root,-) -%{_datadir}/%{name}/*.ks - -%files -n custom-kickstarts -%defattr(-,root,root,-) -%dir %{_datadir}/%{name}/custom/ -%{_datadir}/%{name}/custom/*.ks -%doc %{_datadir}/%{name}/custom/README - -%files -n l10n-kickstarts -%defattr(-,root,root,-) -%dir %{_datadir}/%{name}/l10n/ -%{_datadir}/%{name}/l10n/*.ks -%doc %{_datadir}/%{name}/l10n/README - -%changelog -* Thu May 23 2013 Bruno Wolff III <bruno@wolff.to> 0.20.4-1 -- Pick up changes for getting spins under size limits -- Pick up various fixes for other issues - -* Mon May 06 2013 Bruno Wolff III <bruno@wolff.to> 0.20.3-1 -- Add missing ks files to Makefile.am - bz 959911 - -* Wed May 01 2013 Bruno Wolff III <bruno@wolff.to> 0.20.2-1 -- New ks file for Mate desktop -- Keep up with f19 - -* Fri Mar 15 2013 Bruno Wolff III <bruno@wolff.to> 0.20.1-1 -- Initial package for f20 - -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - - 0.19.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jan 30 2013 Luya Tshimbalanga <luya@fedoraproject.org> 0.19.2-1 -- Design Suite ks renamed as fedora-live-design-suite - -* Sat Oct 06 2012 Bruno Wolff III <bruno@wolff.to> 0.19.1-1 -- Meego ks has been dropped -- Initial package for f19 - -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jun 15 2012 Bruno Wolff III <bruno@wolff.to> 0.18.1-1 -- Initial package for f18 rawhide -- Switch back to rawhide repos until branch -- Include Russian localization ks files - -* Sun Feb 12 2012 Bruno Wolff III <bruno@wolff.to> 0.17.1-1 -- Rebuild post branch to build from branch repos - -* Tue Oct 25 2011 Bruno Wolff III <bruno@wolff.to> 0.17.0-1 -- Initial build of f17 version -- Use rawhide repo by default for live images - -* Sat Oct 15 2011 Bruno Wolff III <bruno@wolff.to> 0.16.2-1 -- Get an up to date version now that we are near f16 final freeze - -* Sat Aug 06 2011 Bruno Wolff III <bruno@wolff.to> 0.16.1-1 -- Update for F16 branch - -* Fri May 20 2011 Bruno Wolff III <bruno@wolff.to> 0.16.0-1 -- Initial F16 build - -* Fri Apr 01 2011 Bruno Wolff III <bruno@wolff.to> 0.15.4-1 -- Enough has changed that it seems worth doing a new beta build - -* Wed Mar 16 2011 Bruno Wolff III <bruno@wolff.to> 0.15.3-1 -- Early beta build to facilitate testing -- The alternate KDE ks file has been added to the package - -* Mon Feb 14 2011 Bruno Wolff III <bruno@wolff.to> 0.15.2-1 -- Rebuild to point to branched release - -* Mon Feb 07 2011 Bruno Wolff III <bruno@wolff.to> 0.15.1-1 -- Pre-alpha release rebuild - -* Sun Oct 31 2010 Bruno Wolff III <bruno@wolff.to> 0.15.0-1 -- Now that F14 is gold, we want a separate rawhide package. -- Includes most stuff from F14, minus some last minute space cutting changes. - -* Tue Jul 27 2010 Bruno Wolff III <bruno@wolff.to> 0.14.1-1 -- Get a snapshot of kickstarts just prior to f14 branch - -* Mon Jun 07 2010 Bruno Wolff III <bruno@wolff.to> 0.14.0-1 -- New release for F14 -- Add some documentation about how rebuild package from git repo -- Change custom kickstarts to use ../ to refer to included kickstarts - -* Sun Jul 05 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.4-1 -- Fix repos in fedora-install-fedora.ks (#505262) - -* Sun May 31 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.3-1 -- New release -- Removed developer spin from the mix - -* Wed Mar 04 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.1-1 -- Added de_CH localized spins - -* Tue Feb 23 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.0-2 -- Remove fedora-livecd-desktop-default.ks - -* Sat Nov 29 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.0-1 -- Point fedora-live-base.ks repos to f-10 -- Remove sysprof from fedora-livedvd-developer.ks -- Latest and final rebuild for Fedora 10 - -* Sat Nov 08 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.2-1 -- Package updates to kickstarts into F-10 package - -* Fri Nov 07 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.1-1 -- Second build for review #448072 - -* Fri May 23 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.01-1 -- Initial packaging |