git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use git from the .eu end
[build.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
a843b22
..
ddc4b8e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-295,6
+295,7
@@
$(1).module := $(firstword $($(1)-MODULES))
$(1).specpath := SPECS/$(notdir $($(1)-SPEC))
$(1).moduledir := MODULES/$$($(1).module)
$(1).codespec := MODULES/$$($(1).module)/$($(1)-SPEC)
$(1).specpath := SPECS/$(notdir $($(1)-SPEC))
$(1).moduledir := MODULES/$$($(1).module)
$(1).codespec := MODULES/$$($(1).module)/$($(1)-SPEC)
+$(1).spec2makeflags := $(if $($(1)-WHITELIST-RPMS),--whitelist-rpms $($(1)-WHITELIST-RPMS),)
endef
$(foreach package, $(ALL), $(eval $(call stage1_package_vars,$(package))))
endef
$(foreach package, $(ALL), $(eval $(call stage1_package_vars,$(package))))
@@
-422,15
+423,18
@@
endif
### this utility allows to extract various info from a spec file
### and to define them in makefiles
### this utility allows to extract various info from a spec file
### and to define them in makefiles
+# use the C code where it works as it's the original one, use the python code otherwise
spec2make: spec2make.c
spec2make: spec2make.c
- $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt
+ $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt
|| ln -s spec2make.py $@
### run spec2make on the spec file and include the result
# usage: spec2make package
### run spec2make on the spec file and include the result
# usage: spec2make package
+# with old rpms (f8&c5) and too recent specfiles (the kernel), we need a patch to spec2make
+# so when <package-NEEDSPECK2MAKEHACK is set, we run spec2make with the --hack flag
define target_mk
MAKE/$(1).mk: $($(1).specpath) spec2make .rpmmacros
mkdir -p MAKE
define target_mk
MAKE/$(1).mk: $($(1).specpath) spec2make .rpmmacros
mkdir -p MAKE
- ./spec2make $($(1)-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk || { rm MAKE/$(1).mk; exit 1; }
+ ./spec2make $($(1)
.spec2makeflags) $($(1)
-RPMFLAGS) $($(1).specpath) $(1) > MAKE/$(1).mk || { rm MAKE/$(1).mk; exit 1; }
endef
$(foreach package,$(ALL),$(eval $(call target_mk,$(package))))
endef
$(foreach package,$(ALL),$(eval $(call target_mk,$(package))))