The following changes were made:

* Modified snap-base/Makefile to work with /bin/sh
  * updated snap.conf to have templatedir in default config
This commit is contained in:
2018-03-30 10:22:11 -05:00
parent a57f57d229
commit 15d00b75ee
3 changed files with 77 additions and 10 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-6 VERSION := 0.0alpha1-7
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

View File

@@ -2,15 +2,29 @@ install: base usr etc var lib snap
base: base:
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
$(DESTDIR)/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc} && \ $(DESTDIR)/bin \
$(DESTDIR)/boot \
$(DESTDIR)/dev \
$(DESTDIR)/etc \
$(DESTDIR)/home \
$(DESTDIR)/lib \
$(DESTDIR)/media \
$(DESTDIR)/mnt \
$(DESTDIR)/opt \
$(DESTDIR)/proc && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/{run,sbin,srv,sys,usr,var} && \ $(DESTDIR)/run \
$(DESTDIR)/sbin \
$(DESTDIR)/srv \
$(DESTDIR)/sys \
$(DESTDIR)/usr \
$(DESTDIR)/var && \
install -v -d -m 0750 -o root -g root \ install -v -d -m 0750 -o root -g root \
$(DESTDIR)/root && \ $(DESTDIR)/root && \
install -v -d -m 1777 $(DESTDIR)/tmp $(DESTDIR)/var/tmp install -v -d -m 1777 $(DESTDIR)/tmp $(DESTDIR)/var/tmp
etc: base etc: base
@ install -v -d -m 0755 -o root -g root $(DESTDIR)/etc/default @install -v -d -m 0755 -o root -g root $(DESTDIR)/etc/default && \
ln -sv ../proc/mounts $(DESTDIR)/etc/mtab ln -sv ../proc/mounts $(DESTDIR)/etc/mtab
lib: usr lib: usr
@@ -29,19 +43,67 @@ snap: usr
usr: base usr: base
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}{bin,include,lib,sbin,src} && \ $(DESTDIR)/usr/bin \
$(DESTDIR)/usr/include \
$(DESTDIR)/usr/lib \
$(DESTDIR)/usr/sbin \
$(DESTDIR)/usr/src \
$(DESTDIR)/usr/local/bin \
$(DESTDIR)/usr/local/include \
$(DESTDIR)/usr/local/lib \
$(DESTDIR)/usr/local/sbin \
$(DESTDIR)/usr/local/src && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}share/{color,dict,doc,info,locale} && \ $(DESTDIR)/usr/share/color \
$(DESTDIR)/usr/share/dict \
$(DESTDIR)/usr/share/doc \
$(DESTDIR)/usr/share/info \
$(DESTDIR)/usr/share/locale \
$(DESTDIR)/usr/local/share/color \
$(DESTDIR)/usr/local/share/dict \
$(DESTDIR)/usr/local/share/doc \
$(DESTDIR)/usr/local/share/info \
$(DESTDIR)/usr/local/share/locale && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}share/{man,misc,terminfo,zoneinfo} && \ $(DESTDIR)/usr/share/man \
$(DESTDIR)/usr/share/misc \
$(DESTDIR)/usr/share/terminfo \
$(DESTDIR)/usr/share/zoneinfo \
$(DESTDIR)/usr/local/share/man \
$(DESTDIR)/usr/local/share/misc \
$(DESTDIR)/usr/local/share/terminfo \
$(DESTDIR)/usr/local/share/zoneinfo && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{libexec,{,local/}share/man/man{1..8}} $(DESTDIR)/usr/libexec \
$(DESTDIR)/usr/share/man/man1 \
$(DESTDIR)/usr/share/man/man2 \
$(DESTDIR)/usr/share/man/man3 \
$(DESTDIR)/usr/share/man/man4 \
$(DESTDIR)/usr/share/man/man5 \
$(DESTDIR)/usr/share/man/man6 \
$(DESTDIR)/usr/share/man/man7 \
$(DESTDIR)/usr/share/man/man8 \
$(DESTDIR)/usr/local/share/man/man1 \
$(DESTDIR)/usr/local/share/man/man2 \
$(DESTDIR)/usr/local/share/man/man3 \
$(DESTDIR)/usr/local/share/man/man4 \
$(DESTDIR)/usr/local/share/man/man5 \
$(DESTDIR)/usr/local/share/man/man6 \
$(DESTDIR)/usr/local/share/man/man7 \
$(DESTDIR)/usr/local/share/man/man8
var: base var: base
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
$(DESTDIR)/var/{log,mail,spool} && \ $(DESTDIR)/var/log \
$(DESTDIR)/var/mail \
$(DESTDIR)/var/spool && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/var/{opt,cache,lib/{color,misc,locate},local} && \ $(DESTDIR)/var/opt \
$(DESTDIR)/var/cache \
$(DESTDIR)/var/lib/color \
$(DESTDIR)/var/lib/misc \
$(DESTDIR)/var/lib/locate \
$(DESTDIR)/var/local && \
ln -sv ../run $(DESTDIR)/var/run && \ ln -sv ../run $(DESTDIR)/var/run && \
ln -sv ../run/lock $(DESTDIR)/var/lock ln -sv ../run/lock $(DESTDIR)/var/lock

View File

@@ -1,2 +1,7 @@
[sources] [sources]
default = http://packages.snaplinux.org/ core dev main default = http://packages.snaplinux.org/ core dev main
[snapinstall]
templatedir = /etc/snap.d/templates
include /etc/snap.d