summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rwxr-xr-xcomponents/binary_hooks (renamed from scripts/build/binary_hooks)0
-rwxr-xr-xcomponents/bootstrap_cdebootstrap (renamed from scripts/build/bootstrap_cdebootstrap)0
-rwxr-xr-xcomponents/bootstrap_debootstrap (renamed from scripts/build/bootstrap_debootstrap)0
-rwxr-xr-xcomponents/bootstrap_hooks (renamed from scripts/build/bootstrap_hooks)0
-rwxr-xr-xcomponents/chroot_hooks (renamed from scripts/build/chroot_hooks)0
-rwxr-xr-xcomponents/source_hooks (renamed from scripts/build/source_hooks)0
7 files changed, 5 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index b4a9c44dc..5374e0205 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,8 @@ test:
@for SCRIPT in $(SCRIPTS); \
do \
- if ! head -n1 $${SCRIPT} | grep -qs python; \
- then \
- sh -n $${SCRIPT}; \
- echo -n "."; \
- fi; \
+ sh -n $${SCRIPT}; \
+ echo -n "."; \
done
@echo " done."
@@ -28,11 +25,8 @@ test:
then \
for SCRIPT in $(SCRIPTS); \
do \
- if ! head -n1 $${SCRIPT} | grep -qs python; \
- then \
- checkbashisms -f -x $${SCRIPT}; \
- echo -n "."; \
- fi; \
+ checkbashisms -f -x $${SCRIPT}; \
+ echo -n "."; \
done; \
else \
echo "WARNING: skipping bashism test - you need to install devscripts."; \
@@ -55,6 +49,7 @@ install:
mkdir -p $(DESTDIR)/usr/lib/live
cp -a scripts/* $(DESTDIR)/usr/lib/live
+ cp -a components/* $(DESTDIR)/usr/lib/live/build
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-build
diff --git a/scripts/build/binary_hooks b/components/binary_hooks
index 16a3e81f7..16a3e81f7 100755
--- a/scripts/build/binary_hooks
+++ b/components/binary_hooks
diff --git a/scripts/build/bootstrap_cdebootstrap b/components/bootstrap_cdebootstrap
index 24eef1d3f..24eef1d3f 100755
--- a/scripts/build/bootstrap_cdebootstrap
+++ b/components/bootstrap_cdebootstrap
diff --git a/scripts/build/bootstrap_debootstrap b/components/bootstrap_debootstrap
index 00d86c327..00d86c327 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/components/bootstrap_debootstrap
diff --git a/scripts/build/bootstrap_hooks b/components/bootstrap_hooks
index 2d6887d58..2d6887d58 100755
--- a/scripts/build/bootstrap_hooks
+++ b/components/bootstrap_hooks
diff --git a/scripts/build/chroot_hooks b/components/chroot_hooks
index ce2287a57..ce2287a57 100755
--- a/scripts/build/chroot_hooks
+++ b/components/chroot_hooks
diff --git a/scripts/build/source_hooks b/components/source_hooks
index d414c424e..d414c424e 100755
--- a/scripts/build/source_hooks
+++ b/components/source_hooks