git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3980252
)
- re-run yum-arch after every package is built
author
Mark Huang
<mlhuang@cs.princeton.edu>
Sun, 4 Sep 2005 17:37:36 +0000
(17:37 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Sun, 4 Sep 2005 17:37:36 +0000
(17:37 +0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
e52fc6b
..
bd3da7e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-289,8
+289,8
@@
ALL += vserver-reference
# vserver-reference may require current packages
vserver-reference: $(filter-out vserver-reference,$(ALL))
# vserver-reference may require current packages
vserver-reference: $(filter-out vserver-reference,$(ALL))
-# ...
which should be indexed fir
st
-vserver-reference: RPMS/yumgroups.xml
RPMS/headers
+# ...
and the yum manife
st
+vserver-reference: RPMS/yumgroups.xml
#
# bootmanager
#
# bootmanager
@@
-305,8
+305,8
@@
ALL += bootmanager
# bootmanager may require current packages
bootmanager: $(filter-out bootmanager,$(ALL))
# bootmanager may require current packages
bootmanager: $(filter-out bootmanager,$(ALL))
-# ...
which should be indexed fir
st
-bootmanager: RPMS/yumgroups.xml
RPMS/headers
+# ...
and the yum manife
st
+bootmanager: RPMS/yumgroups.xml
ifeq ($(findstring $(package),$(ALL)),)
ifeq ($(findstring $(package),$(ALL)),)
@@
-314,18
+314,15
@@
ifeq ($(findstring $(package),$(ALL)),)
all: $(ALL)
# Create package manifest
sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
all: $(ALL)
# Create package manifest
sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
- # Generate yum headers
- $(MAKE) RPMS/yumgroups.xml RPMS/headers
RPMS/yumgroups.xml:
install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
RPMS/yumgroups.xml:
install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
-RPMS/headers:
- yum-arch RPMS
-
# Recurse
$(ALL):
$(MAKE) package=$@
# Recurse
$(ALL):
$(MAKE) package=$@
+ yum-arch RPMS
+ yum-arch SRPMS
# Upload packages to boot server
SERVER := build@boot.planet-lab.org
# Upload packages to boot server
SERVER := build@boot.planet-lab.org