Mainly just moved configs to new CONFIG directory format
This commit is contained in:
5
Makefile
5
Makefile
@@ -18,7 +18,7 @@ DESC = Base system directories and files
|
||||
ARCHIVE :=
|
||||
SRCDIR := $(PWD)/SRC/snap-base
|
||||
PATCHDIR := $(PWD)/SRC/patches
|
||||
VERSION := 0.0alpha1-7
|
||||
VERSION := 0.0alpha1-8
|
||||
|
||||
include /usr/share/snap/Makefile.snaplinux
|
||||
|
||||
@@ -35,4 +35,5 @@ clean:
|
||||
@rm -rvf $(ROOT) \
|
||||
$(SNAPINFO) \
|
||||
$(MANIFEST) \
|
||||
$(FILES)
|
||||
$(FILES) \
|
||||
$(CONFIG)
|
||||
|
||||
20
SNAP/usher
20
SNAP/usher
@@ -7,26 +7,6 @@ case $1 in
|
||||
exit 0
|
||||
;;
|
||||
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
|
||||
install -v -m 600 /dev/null ${TARGET}/var/log/btmp
|
||||
fi
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
install: base usr etc var lib snap
|
||||
install: base usr etc var lib
|
||||
|
||||
base:
|
||||
@install -v -d -m 0755 -o root -g root \
|
||||
@@ -31,16 +31,6 @@ lib: usr
|
||||
@ln -sv lib $(DESTDIR)/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
|
||||
@install -v -d -m 0755 -o root -g root \
|
||||
$(DESTDIR)/usr/bin \
|
||||
|
||||
Reference in New Issue
Block a user