projects
/
profile
/
ivi
/
syslinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change fdt-specific loader into a generic setup_data loader
[profile/ivi/syslinux.git]
/
Makefile.private
diff --git
a/Makefile.private
b/Makefile.private
index
114d086
..
92127e9
100644
(file)
--- a/
Makefile.private
+++ b/
Makefile.private
@@
-1,6
+1,6
@@
## -*- makefile -*- ------------------------------------------------------
##
## -*- makefile -*- ------------------------------------------------------
##
-## Copyright 2000-200
6
H. Peter Anvin - All Rights Reserved
+## Copyright 2000-200
8
H. Peter Anvin - All Rights Reserved
##
## 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
@@
-17,10
+17,11
@@
#
.PHONY: official release
#
.PHONY: official release
-PRIVATE = Makefile.private .depend */.depend
+# These files are removed when tarballs are generated.
+PRIVATE = Makefile.private mk/devel.mk
GIT_DIR ?= .git
GIT_DIR ?= .git
-ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' && pwd)
+ABS_GIT_DIR := $(shell cd '$(GIT_DIR)'
2>/dev/null
&& pwd)
-include release/Makefile.secret
-include release/Makefile.secret
@@
-35,17
+36,19
@@
burn: isolinux.iso
cdrecord -v blank=fast isolinux.iso
official:
cdrecord -v blank=fast isolinux.iso
official:
- $(MAKE) spotless
- $(MAKE) all DATE=`date +'%Y-%m-%d'`
- $(MAKE) dist
+ $(MAKE) spotless CC='$(CC) -m32'
+ $(MAKE) all CC='$(CC) -m32'
+ $(MAKE) strip CC='$(CC) -m32'
+ $(MAKE) dist CC='$(CC) -m32'
release:
test -d release
release:
test -d release
- rm -f '$(GIT_DIR)'/refs/tags/syslinux-$(VERSION)
- cg-tag syslinux-$(VERSION)
+ git tag -a -m syslinux-$(VERSION) -f syslinux-$(VERSION)
-rm -rf release/syslinux-$(VERSION)
-rm -f release/syslinux-$(VERSION).*
-rm -rf release/syslinux-$(VERSION)
-rm -f release/syslinux-$(VERSION).*
- cd release && env GIT_DIR='$(ABS_GIT_DIR)' cg-export -r syslinux-$(VERSION) syslinux-$(VERSION)
+ mkdir -p release/syslinux-$(VERSION)
+ git archive --format=tar syslinux-$(VERSION) | \
+ tar -x -f - -C release/syslinux-$(VERSION)
find release/syslinux-$(VERSION) \
\( -name '*~' -or -name '#*' \) -type f -print0 | \
xargs -0rt rm -f
find release/syslinux-$(VERSION) \
\( -name '*~' -or -name '#*' \) -type f -print0 | \
xargs -0rt rm -f
@@
-53,9
+56,8
@@
release:
< release/syslinux-$(VERSION)/syslinux.spec.in \
> release/syslinux-$(VERSION)/syslinux.spec
rm -f release/syslinux-$(VERSION)/syslinux.spec.in
< release/syslinux-$(VERSION)/syslinux.spec.in \
> release/syslinux-$(VERSION)/syslinux.spec
rm -f release/syslinux-$(VERSION)/syslinux.spec.in
- $(MAKE) -C release/syslinux-$(VERSION) spotless
- $(MAKE) -C release/syslinux-$(VERSION) depend
- $(MAKE) -C release/syslinux-$(VERSION) official
+ $(MAKE) -C release/syslinux-$(VERSION) official DATE=`date +%Y-%m-%d`
+
cd release/syslinux-$(VERSION) && rm -rf $(PRIVATE)
cd release && tar cvvf - syslinux-$(VERSION) | \
gzip -9 > syslinux-$(VERSION).tar.gz
cd release/syslinux-$(VERSION) && rm -rf $(PRIVATE)
cd release && tar cvvf - syslinux-$(VERSION) | \
gzip -9 > syslinux-$(VERSION).tar.gz
@@
-70,12
+72,12
@@
RPMPREREL := $(shell $(PERL) -e 'printf "%.2f.%d\n", $(VERSION)-0.01, $(PRERELNO
prerel:
test -d release
prerel:
test -d release
- rm -f '$(GIT_DIR)'/refs/tags/$(PREREL)
- cg-tag $(PREREL)
- mkdir -p $(PRERELDIR) $(PRERELDIR)/uu
+ git tag -a -m $(PREREL) -f $(PREREL)
-rm -rf $(PRERELDIR)/$(PREREL)
-rm -f $(PRERELDIR)/$(PREREL).*
-rm -rf $(PRERELDIR)/$(PREREL)
-rm -f $(PRERELDIR)/$(PREREL).*
- cd $(PRERELDIR) && env GIT_DIR='$(ABS_GIT_DIR)' cg-export -r $(PREREL) $(PREREL)
+ mkdir -p $(PRERELDIR)/$(PREREL)
+ git archive --format=tar $(PREREL) | \
+ tar -x -f - -C $(PRERELDIR)/$(PREREL)
find $(PRERELDIR)/$(PREREL) \
\( -name '*~' -or -name '#*' \) -type f -print0 | \
xargs -0rt rm -f
find $(PRERELDIR)/$(PREREL) \
\( -name '*~' -or -name '#*' \) -type f -print0 | \
xargs -0rt rm -f
@@
-84,15
+86,10
@@
prerel:
< $(PRERELDIR)/$(PREREL)/syslinux.spec.in \
> $(PRERELDIR)/$(PREREL)/syslinux.spec
rm -f $(PRERELDIR)/$(PREREL)/syslinux.spec.in
< $(PRERELDIR)/$(PREREL)/syslinux.spec.in \
> $(PRERELDIR)/$(PREREL)/syslinux.spec
rm -f $(PRERELDIR)/$(PREREL)/syslinux.spec.in
- $(MAKE) -C $(PRERELDIR)/$(PREREL) spotless
- $(MAKE) -C $(PRERELDIR)/$(PREREL) depend
- $(MAKE) -C $(PRERELDIR)/$(PREREL) all DATE=`printf '%s-pre%d ' $(VERSION) $(PRERELNO) | dd bs=10 count=1 2>/dev/null`
- $(MAKE) -C $(PRERELDIR)/$(PREREL) dist
+ $(MAKE) -C $(PRERELDIR)/$(PREREL) official DATE=`printf '%s-pre%d ' $(VERSION) $(PRERELNO) | dd bs=10 count=1 2>/dev/null`
cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRIVATE)
cd $(PRERELDIR) && tar cvvf - $(PREREL) | \
gzip -9 > $(PREREL).tar.gz
cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRIVATE)
cd $(PRERELDIR) && tar cvvf - $(PREREL) | \
gzip -9 > $(PREREL).tar.gz
- cd $(PRERELDIR) && \
- uuencode $(PREREL).tar.gz $(PREREL).tar.gz > uu/$(PREREL).uu
cd $(PRERELDIR)/$(PREREL) && \
zip -9r ../$(PREREL).zip *
expr $(PRERELNO) + 1 > $(PRERELDIR)/.prerel
cd $(PRERELDIR)/$(PREREL) && \
zip -9r ../$(PREREL).zip *
expr $(PRERELNO) + 1 > $(PRERELDIR)/.prerel
@@
-103,7
+100,3
@@
LATEST_PREREL := syslinux-$(VERSION)-pre$(LATEST_PRERELNO)
unprerel:
echo $(LATEST_PRERELNO) > $(PRERELDIR)/.prerel
@echo Next release will be $(LATEST_PREREL)
unprerel:
echo $(LATEST_PRERELNO) > $(PRERELDIR)/.prerel
@echo Next release will be $(LATEST_PREREL)
-
-preupload:
- scp $(PRERELDIR)/$(LATEST_PREREL).* $(UPLOAD)/Testing
- cg-push -t $(LATEST_PREREL)