Mainly just moved configs to new CONFIG directory format

This commit is contained in:
2018-07-28 15:07:41 -05:00
parent 15d00b75ee
commit 4a184e88bf
10 changed files with 4 additions and 33 deletions

View File

@@ -18,7 +18,7 @@ DESC = Base system directories and files
ARCHIVE := ARCHIVE :=
SRCDIR := $(PWD)/SRC/snap-base SRCDIR := $(PWD)/SRC/snap-base
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
VERSION := 0.0alpha1-7 VERSION := 0.0alpha1-8
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -35,4 +35,5 @@ clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \
$(SNAPINFO) \ $(SNAPINFO) \
$(MANIFEST) \ $(MANIFEST) \
$(FILES) $(FILES) \
$(CONFIG)

View File

@@ -7,26 +7,6 @@ case $1 in
exit 0 exit 0
;; ;;
postinst) postinst)
if [ ! -f ${TARGET}/etc/bashrc ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/bashrc \
${TARGET}/etc/bashrc
fi
if [ ! -f ${TARGET}/etc/group ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/group \
${TARGET}/etc/group
fi
if [ ! -f ${TARGET}/etc/passwd ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/passwd \
${TARGET}/etc/passwd
fi
if [ ! -f ${TARGET}/etc/profile ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/profile \
${TARGET}/etc/profile
fi
if [ ! -f ${TARGET}/etc/snap.conf ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/snap.conf \
${TARGET}/etc/snap.conf
fi
if [ ! -f ${TARGET}/var/log/btmp ]; then if [ ! -f ${TARGET}/var/log/btmp ]; then
install -v -m 600 /dev/null ${TARGET}/var/log/btmp install -v -m 600 /dev/null ${TARGET}/var/log/btmp
fi fi

View File

@@ -1,4 +1,4 @@
install: base usr etc var lib snap install: base usr etc var lib
base: base:
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
@@ -31,16 +31,6 @@ lib: usr
@ln -sv lib $(DESTDIR)/lib64 && \ @ln -sv lib $(DESTDIR)/lib64 && \
ln -sv lib $(DESTDIR)/usr/lib64 ln -sv lib $(DESTDIR)/usr/lib64
snap: usr
install -v -d -m 0755 $(DESTDIR)/usr/share/snap-base && \
install -v -m 0644 bashrc $(DESTDIR)/usr/share/snap-base/bashrc && \
install -v -m 0644 group $(DESTDIR)/usr/share/snap-base/group && \
install -v -m 0644 passwd $(DESTDIR)/usr/share/snap-base/passwd && \
install -v -m 0644 profile $(DESTDIR)/usr/share/snap-base/profile && \
install -v -m 0644 snap.conf \
$(DESTDIR)/usr/share/snap-base/snap.conf && \
install -v -m 0644 snap_version $(DESTDIR)/etc/snap_version
usr: base usr: base
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/bin \ $(DESTDIR)/usr/bin \