git.annexia.org
/
a-fedora-appliance.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add yum to the appliance to support installing packages.
[a-fedora-appliance.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
363af81
..
ced1c9b
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,5
+1,5
@@
# a-fedora-appliance
# a-fedora-appliance
-# Copyright (C) 2011 Red Hat Inc.
+# Copyright (C) 2011
-2014
Red Hat Inc.
#
# 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
#
# 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
@@
-18,7
+18,6
@@
EXTRA_DIST = \
.gitignore \
a-fedora-appliance.spec \
EXTRA_DIST = \
.gitignore \
a-fedora-appliance.spec \
- extra-find-requires.sh \
firstboot \
init \
make.sh.in \
firstboot \
init \
make.sh.in \
@@
-27,7
+26,7
@@
EXTRA_DIST = \
CLEANFILES = *~ make.sh stamp-supermin
clean-local:
CLEANFILES = *~ make.sh stamp-supermin
clean-local:
- rm -rf supermin.d
+ rm -rf supermin.d
appliance.d
bin_SCRIPTS = boot-a-fedora-appliance
bin_SCRIPTS = boot-a-fedora-appliance
@@
-35,22
+34,20
@@
libexec_SCRIPTS = build-a-fedora-appliance
fsdir = $(libdir)/a-fedora-appliance/supermin.d
fs_DATA = \
fsdir = $(libdir)/a-fedora-appliance/supermin.d
fs_DATA = \
- supermin.d/base.
img
\
- supermin.d/init.
img
\
- supermin.d/
hostfil
es
+ supermin.d/base.
tar.gz
\
+ supermin.d/init.
tar.gz
\
+ supermin.d/
packag
es
-supermin.d/base.
img supermin.d/hostfil
es: stamp-supermin
+supermin.d/base.
tar.gz supermin.d/packag
es: stamp-supermin
stamp-supermin: make.sh
mkdir -p supermin.d
stamp-supermin: make.sh
mkdir -p supermin.d
- rm -f $@ supermin.d/base.
img supermin.d/hostfil
es
+ rm -f $@ supermin.d/base.
tar.gz supermin.d/packag
es
./make.sh
touch $@
./make.sh
touch $@
-supermin.d/init.
img
: init firstboot
+supermin.d/init.
tar.gz
: init firstboot
mkdir -p supermin.d
mkdir -p supermin.d
- rm -f $@ $@-t
- echo -e "init\nfirstboot" | cpio --quiet -o -H newc > $@-t
- mv $@-t $@
+ tar zcf $@ $^
# This used to be a configure-generated file. However config.status
# always touches the destination file, which means the appliance got
# This used to be a configure-generated file. However config.status
# always touches the destination file, which means the appliance got
@@
-63,32
+60,24
@@
make.sh: make.sh.in
# For local build/testing.
local-build:
# For local build/testing.
local-build:
- ./build-a-fedora-appliance supermin.d
kernel initrd root
+ ./build-a-fedora-appliance supermin.d
appliance.d
local-boot:
./boot-a-fedora-appliance --local
# To build an RPM in Koji.
local-boot:
./boot-a-fedora-appliance --local
# To build an RPM in Koji.
-koji-f17:
- rpmbuild -bs \
- --define "_srcrpmdir $$(pwd)" \
- --define "_sourcedir $$(pwd)" \
- --define "dist .fc17" a-fedora-appliance.spec
- koji build --scratch f17 \
- $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc17.src.rpm
-
-koji-f16:
+koji-f18:
rpmbuild -bs \
--define "_srcrpmdir $$(pwd)" \
--define "_sourcedir $$(pwd)" \
rpmbuild -bs \
--define "_srcrpmdir $$(pwd)" \
--define "_sourcedir $$(pwd)" \
- --define "dist .fc1
6
" a-fedora-appliance.spec
- koji build --scratch f1
6
\
- $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc1
6
.src.rpm
+ --define "dist .fc1
8
" a-fedora-appliance.spec
+ koji build --scratch f1
8
\
+ $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc1
8
.src.rpm
-koji-f1
5
:
+koji-f1
7
:
rpmbuild -bs \
--define "_srcrpmdir $$(pwd)" \
--define "_sourcedir $$(pwd)" \
rpmbuild -bs \
--define "_srcrpmdir $$(pwd)" \
--define "_sourcedir $$(pwd)" \
- --define "dist .fc1
5
" a-fedora-appliance.spec
- koji build --scratch
dist-f15
\
- $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc1
5
.src.rpm
+ --define "dist .fc1
7
" a-fedora-appliance.spec
+ koji build --scratch
f17
\
+ $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(RELEASE).fc1
7
.src.rpm