Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sertonix
apk-tools
Commits
9c4fdf9e
Commit
9c4fdf9e
authored
15 years ago
by
Timo Teräs
Browse files
Options
Downloads
Patches
Plain Diff
build: create archive directly from git tree
So we don't get local modifications or extra files in the tarball.
parent
c8c98513
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Make.rules
+15
-4
15 additions, 4 deletions
Make.rules
Makefile
+1
-0
1 addition, 0 deletions
Makefile
with
16 additions
and
4 deletions
Make.rules
+
15
−
4
View file @
9c4fdf9e
...
@@ -49,8 +49,7 @@ export srctree objtree
...
@@ -49,8 +49,7 @@ export srctree objtree
GIT_REV := $(shell test -d .git && git describe || echo exported)
GIT_REV := $(shell test -d .git && git describe || echo exported)
ifneq ($(GIT_REV), exported)
ifneq ($(GIT_REV), exported)
FULL_VERSION := $(patsubst $(PACKAGE)-%,%,$(GIT_REV))
FULL_VERSION := $(patsubst $(TAGPREFIX)%,%,$(GIT_REV))
FULL_VERSION := $(patsubst v%,%,$(FULL_VERSION))
else
else
FULL_VERSION := $(VERSION)
FULL_VERSION := $(VERSION)
endif
endif
...
@@ -172,8 +171,9 @@ if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \
...
@@ -172,8 +171,9 @@ if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \
#####
#####
# Handle options to gcc.
# Handle options to gcc.
c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CFLAGS_ALL) $(CFLAGS_$(notdir $@))
c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CFLAGS_ALL) $(CFLAGS_EXTRA) \
ld_flags = $(LDFLAGS_ALL) $(LDFLAGS_$(notdir $@))
$(CFLAGS_$(notdir $@))
ld_flags = $(LDFLAGS_ALL) $(LDFLAGS_EXTRA) $(LDFLAGS_$(notdir $@))
#####
#####
# Compile c-files.
# Compile c-files.
...
@@ -252,6 +252,17 @@ ifeq ($(toplevelrun),yes)
...
@@ -252,6 +252,17 @@ ifeq ($(toplevelrun),yes)
endif
endif
$(Q)rm -rf $(addprefix $(obj)/,$(sort $(progs-y) $(progs-n) $(progs-)))
$(Q)rm -rf $(addprefix $(obj)/,$(sort $(progs-y) $(progs-n) $(progs-)))
ifeq ($(origin VERSION),command line)
DIST_VERSION=$(VERSION)
else
DIST_VERSION=$(FULL_VERSION)
endif
dist:
git archive --format tar --prefix=$(PACKAGE)-$(DIST_VERSION)/ \
$(TAGPREFIX)$(DIST_VERSION) \
| bzip2 -9 > $(PACKAGE)-$(DIST_VERSION).tar.bz2
FORCE:
FORCE:
# Read all saved command lines and dependencies for the $(targets) we
# Read all saved command lines and dependencies for the $(targets) we
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
1
−
0
View file @
9c4fdf9e
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
# Building apk-tools
# Building apk-tools
PACKAGE
:=
apk-tools
PACKAGE
:=
apk-tools
TAGPREFIX
:=
$(
PACKAGE
)
-
VERSION
:=
2.0_pre12
VERSION
:=
2.0_pre12
##
##
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment