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
for fedora 37: network initialization (for static IP only for now)
[build.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
a214aa0
..
ad95581
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-201,9
+201,6
@@
DISTCLEANS += $(1).mk $(2).mk config.$(1)
$(eval $(call remote_pldistro_fetch_$(3),$(1)))
endef
$(eval $(call remote_pldistro_fetch_$(3),$(1)))
endef
-$(eval $(call remote_pldistro,wextoolbox,wextoolbox-tags,git))
-$(eval $(call remote_pldistro,wexlxc,wexlxc-tags,git))
-
########## stage1 and stage1iter
# extract specs and compute .mk files by running
# make stage1=true
########## stage1 and stage1iter
# extract specs and compute .mk files by running
# make stage1=true
@@
-351,7
+348,7
@@
header.spec:
echo "%global _source_filedigest_algorithm 1" >> $@
echo "%global _source_payload w9.gzdio" >> $@
echo "%global _binary_payload w9.gzdio" >> $@
echo "%global _source_filedigest_algorithm 1" >> $@
echo "%global _source_payload w9.gzdio" >> $@
echo "%global _binary_payload w9.gzdio" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29
f31 f33 f35 f37
)"
echo "%define debug_package %{nil}" >> $@
endif
echo "%define debug_package %{nil}" >> $@
endif
@@
-395,9
+392,7
@@
endef
# $(1)/ gets cleaned up if job cannot be done
define fetch_git_module
mkdir $(1) ; \
# $(1)/ gets cleaned up if job cannot be done
define fetch_git_module
mkdir $(1) ; \
- (git archive --remote=$($(1).gitrepo) $($(1).gittag) | tar -C $(1) -xf - ) || \
- (echo "==================== git archive FAILED, trying git clone instead" ; \
- git clone $($(1).gitrepo) $(1); cd $(1) ; git checkout $($(1).gittag) ; rm -rf .git ) || \
+ ( git clone $($(1).gitrepo) $(1); cd $(1) ; git checkout $($(1).gittag) ; rm -rf .git ) || \
{ rm -rf $(1); false; }
endef
{ rm -rf $(1); false; }
endef
@@
-455,8
+450,8
@@
endif
### 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
### 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
-
$(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt ||
ln -s spec2make.py $@
+spec2make:
spec2make.py
+ 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
@@
-514,6
+509,9
@@
tarballs: $(ALLTARBALLS)
@echo $(words $(ALLTARBALLS)) source tarballs OK
.PHONY: tarballs
@echo $(words $(ALLTARBALLS)) source tarballs OK
.PHONY: tarballs
+SOURCES/%.tar.xz: SOURCES/%
+ tar chpJf $@ -C SOURCES $*
+
SOURCES/%.tar.bz2: SOURCES/%
tar chpjf $@ -C SOURCES $*
SOURCES/%.tar.bz2: SOURCES/%
tar chpjf $@ -C SOURCES $*