1 Commits

Author SHA1 Message Date
Jay Larson
8c66f6df9f Re-added config.tar.gz to Makefile.snaplinux among other minor tweaks 2020-08-21 14:46:18 -05:00
3 changed files with 24 additions and 11 deletions

View File

@@ -80,13 +80,13 @@ VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SLVER)
include /usr/share/sl/Makefile.snaplinux include /usr/share/sl/Makefile.snaplinux
$(SRCDIR)/configure: $(ARCHIVE) $(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @if [ '$(TYPE)' = 'application/x-bzip2' ]; then \
tar -jxf $(ARCHIVE); \ tar -jxf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-gzip' ]; then \ elif [ '$(TYPE)' = 'application/x-gzip' ]; then \
tar -zxf $(ARCHIVE); \ tar -zxf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-tar' ]; then \ elif [ '$(TYPE)' = 'application/x-tar' ]; then \
tar -xf $(ARCHIVE); \ tar -xf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-xz' ]; then \ elif [ '$(TYPE)' = 'application/x-xz' ]; then \
tar -xf $(ARCHIVE); \ tar -xf $(ARCHIVE); \
else \ else \
echo 'Unable to determine archive type'; \ echo 'Unable to determine archive type'; \

View File

@@ -65,6 +65,8 @@ endif
SLINFO = $(SLDIR)/slinfo SLINFO = $(SLDIR)/slinfo
MANIFEST = $(SLDIR)/manifest MANIFEST = $(SLDIR)/manifest
USHER = $(SLDIR)/usher USHER = $(SLDIR)/usher
CONFIGDIR = $(PWD)/CONFIG
CONFIG = $(SLDIR)/config.tar.gz
FILES = $(SLDIR)/files.tar.gz FILES = $(SLDIR)/files.tar.gz
# BRIEF is required. # BRIEF is required.
@@ -78,12 +80,19 @@ $(PKGFILE): $(SLINFO) $(FILES)
rm -v $(PKGFILE); \ rm -v $(PKGFILE); \
fi fi
@ar cvr $(PKGFILE) $(SLINFO) $(MANIFEST); \ @ar cvr $(PKGFILE) $(SLINFO) $(MANIFEST) && \
if [ -f $(USHER) ]; then \ if [ -f $(USHER) ]; then \
chmod +x $(USHER); \ chmod +x $(USHER) && \
ar cvr $(PKGFILE) $(USHER); \ ar cvr $(PKGFILE) $(USHER); \
fi; \ fi && \
ar cvr $(PKGFILE) $(FILES) ar cvr $(PKGFILE) $(FILES) && \
if [ -d $(CONFIGDIR) ] && [ "$$(ls -A)" ]; then \
cd $(CONFIGDIR) && \
tar cvzf $(CONFIG) *; \
if [ -f $(CONFIG) ]; then \
ar cvr $(PWD)/$(PKGFILE) $(CONFIG); \
fi; \
fi
@echo "Successfully built $(PKGFILE)" @echo "Successfully built $(PKGFILE)"
@@ -176,5 +185,9 @@ $(FILES): $(ROOT)
;; \ ;; \
esac; \ esac; \
done done
@cd $(ROOT) && tar cvzf $(FILES) * @cd $(ROOT) && \
if [ "$$(ls -A)" ]; then \
tar cvzf $(FILES) *; \
else \
tar cvzf $(FILES) -T /dev/null; \
fi

View File

@@ -40,7 +40,7 @@ our @EXPORT = qw(
$sl $sl
); );
our $VERSION = '0.18'; our $VERSION = '0.19';
############################################################ ############################################################
# #