diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | INSTALL | 31 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | package/deps.mak | 6 | ||||
| -rw-r--r-- | package/targets.mak | 11 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 18 | ||||
| -rwxr-xr-x | tools/gen-targets.sh | 49 |
8 files changed, 69 insertions, 70 deletions
@@ -1,5 +1,5 @@ Main author: - Paul Sopka <psopka@sopka.ch> + PS <p@0x53.net> Contributors: @@ -4,48 +4,45 @@ Build Instructions * Requirements ------------ - - A POSIX-compliant set of utils - - A set of OS specific utils - - s6 https://skarnet.org/software/s6/ - - s6-rc https://skarnet.org/software/s6-rc/ + - A set POSIX-compliant and OS specific utils, see https://0x53.net/software/requirements.html + - mdevd https://skarnet.org/software/mdevd/ - execline https://skarnet.org/software/execline/ - This software will run on any operating system that implements -POSIX.1-2008, available at: - https://pubs.opengroup.org/onlinepubs/9699919799/ +This software will run on any operating system +that runs the requirements above. * Standard usage -------------- - ./configure && make && sudo make install + ./configure && make && make install - will work for most users. +will work for most users. * Customization ------------- - You can customize paths via flags given to configure. - See ./configure --help for a list of all available configure options. +You can customize paths via flags given to configure. +See ./configure --help for a list of all available configure options. * Make variables -------------- - You can invoke make with a few variables for more configuration. +You can invoke make with a few variables for more configuration. - INSTALL can be overridden on the make command line. This is +INSTALL can be overridden on the make command line. This is an even bigger hammer than running ./configure with environment variables, so it is advised to only do this when it is the only way of obtaining the behaviour you want. - DESTDIR can be given on the "make install" command line in order to +DESTDIR can be given on the "make install" command line in order to install to a staging directory. * The slashpackage convention --------------------------- - The slashpackage convention (http://cr.yp.to/slashpackage.html) +The slashpackage convention (http://cr.yp.to/slashpackage.html) is a package installation scheme that provides a few guarantees over other conventions such as the FHS, for instance fixed absolute pathnames. skarnet.org packages support it: use the @@ -66,7 +63,7 @@ location in the filesystem) --prefix is pretty much ignored when you use --enable-slashpackage. You should probably not use both --enable-slashpackage and --prefix. - When using slashpackage, two additional Makefile targets are +When using slashpackage, two additional Makefile targets are available after "make install": - "make update" changes the default version of the software to the freshly installed one. (This is useful when you have several installed @@ -78,6 +75,6 @@ default version of the binaries and shared libraries. * Out-of-tree builds ------------------ - This package does not support out-of-tree builds. It +This package does not support out-of-tree builds. It is small, so it does not cost much to duplicate the entire source tree if parallel builds are needed. @@ -36,12 +36,12 @@ distclean: clean tgz: distclean @. package/info && \ - rm -rf /tmp/$$package-$$version && \ - cp -a . /tmp/$$package-$$version && \ - cd /tmp && \ - tar -zpcv --owner=0 --group=0 --numeric-owner --exclude=.git* -f /tmp/$$package-$$version.tar.gz $$package-$$version && \ + rm -rf ../../stage/$$package-$$version && \ + cp -a . ../../stage/$$package-$$version && \ + cd ../../stage && \ + tar -zpcv --owner=0 --group=0 --numeric-owner --exclude=.git* -f $$package-$$version.tar.gz $$package-$$version && \ sha256sum $$package-$$version.tar.gz > $$package-$$version.tar.gz.sha256 && \ - exec rm -rf /tmp/$$package-$$version + exec rm -rf $$package-$$version install: $(INSTALL_BINS) $(INSTALL_LIBS) $(INSTALL_EXTRAS) @@ -63,7 +63,7 @@ $(ALL_BINS) $(ALL_LIBS): -- $^ > $@ $(INSTALL_BINS) $(INSTALL_LIBS): - exec $(INSTALL) -D -m 644 $^ $@ + exec $(INSTALL) -D -m 644 $^ $(DESTDIR)/$@ grep -F -- $^ - < package/modes | { read name mode owner && \ if [ x$${mode} != x ] ; then chmod $${mode} $@ ; fi && \ if [ x$${owner} != x ] ; then chown -- $${owner} $@ ; fi ; } || exit 0 @@ -73,15 +73,11 @@ $(DESTDIR)$(exthome): exec $(INSTALL) -D -l $(package)-$(version) $@ $(SLASHCOMMAND_BINS): - exec $(INSTALL) -D -l $(exthome)/command/$$(basename $@) $@ + exec $(INSTALL) -D -l $(DESTDIR)$(exthome)/command/$$(basename $@) $@ update: $(DESTDIR)$(exthome) global-links: $(SLASHCOMMAND_BINS) -uninstall: - exec rm -f $(INSTALL_BINS) $(SLASHCOMMAND_BINS) - exec rm -Rf $(libdir) - .PHONY: \ it all clean distclean tgz update global-links \ install uninstall \ @@ -1,6 +1,6 @@ -Changelog for goetia-base. +Changelog for mdevd-conf. -In 0.0.0.1 +In 0.1.0.0 ---------- - Initial release diff --git a/package/deps.mak b/package/deps.mak index 4791490..0c9a4f0 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -3,8 +3,8 @@ # mddc-add-block-sym: src/bin/mddc-add-block-sym -$(DESTDIR)$(bindir)/mddc-add-block-sym: mddc-add-block-sym +$(bindir)/mddc-add-block-sym: mddc-add-block-sym mddc-del-block-sym: src/bin/mddc-del-block-sym -$(DESTDIR)$(bindir)/mddc-del-block-sym: mddc-del-block-sym +$(bindir)/mddc-del-block-sym: mddc-del-block-sym etc/mdev.conf: src/lib/etc/mdev.conf -$(DESTDIR)$(libdir)/etc/mdev.conf: etc/mdev.conf +$(libdir)/etc/mdev.conf: etc/mdev.conf diff --git a/package/targets.mak b/package/targets.mak index ab9faf1..c8dcb36 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -7,16 +7,15 @@ ALL_BINS ::= \ mddc-del-block-sym \ INSTALL_BINS ::= \ - $(DESTDIR)$(bindir)/mddc-add-block-sym \ - $(DESTDIR)$(bindir)/mddc-del-block-sym \ + $(bindir)/mddc-add-block-sym \ + $(bindir)/mddc-del-block-sym \ SLASHCOMMAND_BINS ::= \ - $(DESTDIR)$(sproot)/command/mddc-add-block-sym \ - $(DESTDIR)$(sproot)/command/mddc-del-block-sym \ + $(sproot)/command/mddc-add-block-sym \ + $(sproot)/command/mddc-del-block-sym \ ALL_LIBS ::= \ etc/mdev.conf \ INSTALL_LIBS ::= \ - $(DESTDIR)$(libdir)/etc/mdev.conf \ - + $(libdir)/etc/mdev.conf \ diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index fafb347..23cd98f 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -2,17 +2,17 @@ . package/info -echo '#' -echo '# This file has been generated by tools/gen-deps.sh' -echo '#' -echo +printf '#\n' +printf '# This file has been generated by tools/gen-deps.sh\n' +printf '#\n' +printf '\n' if test -d src/bin then cd src/bin for FILE in $(find * -type f 2> /dev/null); do - echo "${FILE}: src/bin/${FILE}" - echo "\$(DESTDIR)\$(bindir)/${FILE}: ${FILE}" + printf "${FILE}: src/bin/${FILE}\n" + printf "\$(bindir)/${FILE}: ${FILE}\n" done cd ../.. fi @@ -21,8 +21,8 @@ if test -d src/lib then cd src/lib for FILE in $(find * -type f 2> /dev/null); do - echo "${FILE}: src/lib/${FILE}" - echo "\$(DESTDIR)\$(libdir)/${FILE}: ${FILE}" + printf "${FILE}: src/lib/${FILE}\n" + printf "\$(libdir)/${FILE}: ${FILE}\n" done cd ../.. fi @@ -30,6 +30,6 @@ fi if test -f package/extras then for EXTRA in $(cat package/extras); do - echo "\$(DESTDIR)\$(libdir)/${EXTRA}: ${EXTRA}" + printf "\$(libdir)/${EXTRA}: ${EXTRA}\n" done fi diff --git a/tools/gen-targets.sh b/tools/gen-targets.sh index 3280748..f772754 100755 --- a/tools/gen-targets.sh +++ b/tools/gen-targets.sh @@ -2,55 +2,62 @@ . package/info -echo '#' -echo '# This file has been generated by tools/gen-targets.sh' -echo '#' -echo +printf '#\n' +printf '# This file has been generated by tools/gen-targets.sh\n' +printf '#\n' +printf '\n' if test -d src/bin then cd src/bin - echo "ALL_BINS ::= \\" + printf "ALL_BINS ::= \\" + printf "\n" for FILE in $(find * -type f 2> /dev/null) ; do - echo "\t${FILE} \\" + printf "\t${FILE} \\" + printf "\n" done - echo - echo "INSTALL_BINS ::= \\" + printf "\n" + printf "INSTALL_BINS ::= \\" + printf "\n" for FILE in $(find * -type f 2> /dev/null) ; do - echo "\t\$(DESTDIR)\$(bindir)/${FILE} \\" + printf "\t\$(bindir)/${FILE} \\" + printf "\n" done - echo - echo "SLASHCOMMAND_BINS ::= \\" + printf "\n" + printf "SLASHCOMMAND_BINS ::= \\" + printf "\n" for FILE in $(find * -type f 2> /dev/null) ; do - echo "\t\$(DESTDIR)\$(sproot)/command/${FILE} \\" + printf "\t\$(sproot)/command/${FILE} \\" + printf "\n" done cd ../.. - echo + printf "\n" fi if test -d src/lib then cd src/lib - echo "ALL_LIBS ::= \\" + printf "ALL_LIBS ::= \\" + printf "\n" for FILE in $(find * -type f 2> /dev/null) ; do - echo "\t${FILE} \\" + printf "\t${FILE} \\" + printf "\n" done - echo + printf "\n" - echo "INSTALL_LIBS ::= \\" + printf "INSTALL_LIBS ::= \\" + printf "\n" for FILE in $(find * -type f 2> /dev/null) ; do - echo "\t\$(DESTDIR)\$(libdir)/${FILE} \\" + printf "\t\$(libdir)/${FILE} \\" + printf "\n" done - - cd ../.. - echo fi |