aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile33
-rwxr-xr-xbootchartd.in (renamed from bootchartd)1
-rwxr-xr-xinitramfs-init.in (renamed from initramfs-init)4
-rwxr-xr-xmkinitfs.in (renamed from mkinitfs)2
4 files changed, 30 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index b9eb682..1162dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-VERSION := $(shell awk -F= '$$1=="VERSION" {print($$2)}' mkinitfs)
-
+VERSION := 1.1
SBIN_FILES := mkinitfs bootchartd
SHARE_FILES := initramfs-init
@@ -16,22 +15,42 @@ CONF_FILES := mkinitfs.conf \
files.d/bootchart \
files.d/base
-DISTFILES := $(SBIN_FILES) $(CONF_FILES) $(SHARE_FILES) Makefile
+SCRIPTS := $(SBIN_FILES) $(SHARE_FILES)
+IN_FILES := $(addsuffix .in,$(SCRIPTS))
+
+GIT_REV := $(shell git describe || echo exported)
+ifneq ($(GIT_REV), exported)
+FULL_VERSION := $(patsubst $(PACKAGE)-%,%,$(GIT_REV))
+FULL_VERSION := $(patsubst v%,%,$(FULL_VERSION))
+else
+FULL_VERSION := $(VERSION)
+endif
+
+
+DISTFILES := $(IN_FILES) $(CONF_FILES) Makefile
INSTALL := install
+SED := sed
+SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g'
+
+all: $(SCRIPTS)
help:
@echo mkinitfs $(VERSION)
@echo "usage: make install [DESTDIR=]"
-install:
+.SUFFIXES: .in
+.in:
+ ${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
+
+install: $(SBIN_FILES) $(SHARE_FILES) $(CONF_FILES)
for i in $(SBIN_FILES); do \
- $(INSTALL) -Dm755 $$i $(DESTDIR)/sbin/$$i || exit 1;\
+ $(INSTALL) -Dm755 $$i $(DESTDIR)/sbin/$$i;\
done
for i in $(CONF_FILES); do \
- $(INSTALL) -Dm644 $$i $(DESTDIR)/etc/mkinitfs/$$i || exit 1;\
+ $(INSTALL) -Dm644 $$i $(DESTDIR)/etc/mkinitfs/$$i;\
done
for i in $(SHARE_FILES); do \
- $(INSTALL) -D $$i $(DESTDIR)/usr/share/mkinitfs/$$i || exit 1;\
+ $(INSTALL) -D $$i $(DESTDIR)/usr/share/mkinitfs/$$i;\
done
diff --git a/bootchartd b/bootchartd.in
index 43fdfe9..c4daa35 100755
--- a/bootchartd
+++ b/bootchartd.in
@@ -13,6 +13,7 @@
# bootup procedure only.
#
+VERSION=@VERSION@
PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH"
# Configuration for bootchartd, the bootchart logger script.
diff --git a/initramfs-init b/initramfs-init.in
index d9a9d68..7c2b2db 100755
--- a/initramfs-init
+++ b/initramfs-init.in
@@ -1,7 +1,7 @@
-#!/bin/busybox sh
+#!/bin/sh
# this is the init script version
-VERSION=1.1
+VERSION=@VERSION@
NEWROOT=/newroot
SINGLEMODE=no
diff --git a/mkinitfs b/mkinitfs.in
index af52edb..85ce5b0 100755
--- a/mkinitfs
+++ b/mkinitfs.in
@@ -1,6 +1,6 @@
#!/bin/sh
-VERSION=1.0
+VERSION=@VERSION@
_cp() {
local i