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 (from parent 1:
f05bfdd
)
reorder
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Mon, 23 Sep 2013 11:06:34 +0000
(13:06 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Mon, 23 Sep 2013 11:06:34 +0000
(13:06 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
12d4a00
..
d453f80
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-528,10
+528,10
@@
srpms: $(ALLSRPMS)
#################### manage build requirements
# default values
RPMYUM-INSTALL-LOCAL := rpm --force -Uvh
#################### manage build requirements
# default values
RPMYUM-INSTALL-LOCAL := rpm --force -Uvh
+RPMYUM-INSTALL-STOCK := yum -y install
# uninstall -- cannot force rpm -e
# need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it
RPMYUM-UNINSTALL-STOCK := rpm -e
# uninstall -- cannot force rpm -e
# need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it
RPMYUM-UNINSTALL-STOCK := rpm -e
-RPMYUM-INSTALL-STOCK := yum -y install
### these macro handles the LOCAL-DEVEL-RPMS and LOCAL-DEVEL-RPMS-CRUCIAL tags for a given package
# before building : rpm-install LOCAL-DEVEL-RPMS
### these macro handles the LOCAL-DEVEL-RPMS and LOCAL-DEVEL-RPMS-CRUCIAL tags for a given package
# before building : rpm-install LOCAL-DEVEL-RPMS