Browse Source

Fix libcap build on some architectures; Fix some issues with shell startup

scripts; Improve firmware Makefile; Fix messages in hhl.staticlib.mk
odin
Nathan Fisher 3 weeks ago
parent
commit
10afb1cd9b
  1. 2
      firmware/Makefile
  2. 1
      include/mk/hhl.staticlib.mk
  3. 0
      kernel/config-aarch64-5.19.4.config
  4. 8
      world/fs_skeleton/etc/profile.d/dircolors.sh
  5. 6
      world/fs_skeleton/etc/profile.d/pkgsrc.sh
  6. 12
      world/fs_skeleton/etc/zshenv
  7. 8
      world/fs_skeleton/etc/zshenv.d/dircolors.zsh
  8. 3
      world/fs_skeleton/etc/zshenv.d/pkgsrc.zsh
  9. 2
      world/libcap/Makefile

2
firmware/Makefile

@ -9,7 +9,7 @@ objdir = $(srcdir)
install_firmware: $(objdir)/.installed
$(objdir)/.installed: $(srcdir)/.dirstamp | $(DESTDIR)/lib/firmware
cp -Rv $(srcdir)/* $(DESTDIR)/lib/firmware
$(MAKE) DESTDIR=$(DESTDIR) -C $(srcdir) install
$(DESTDIR)/lib/firmware:
install -d $@

1
include/mk/hhl.staticlib.mk

@ -26,6 +26,7 @@ $(libdir)/$(staticlib): $(staticlib) | $(libdir)
install $< $@
clean:
$(info $(grn)=== Cleaning for $(staticlib) ===$(reset))
rm -rf $(objdir) $(staticlib)
.PHONY: all clean

0
kernel/config-aarch64-5.19.3.config → kernel/config-aarch64-5.19.4.config

8
world/fs_skeleton/etc/profile.d/dircolors.sh

@ -1,8 +1,8 @@
# Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
if [ -f "/etc/dircolors" ] ; then
eval $(dircolors -b /etc/dircolors)
if [ -f "/etc/dircolors" ]
then eval $(dircolors -b /etc/dircolors)
fi
if [ -f "$HOME/.dircolors" ] ; then
eval $(dircolors -b $HOME/.dircolors)
if [ -f "$HOME/.dircolors" ]
then eval $(dircolors -b $HOME/.dircolors)
fi

6
world/fs_skeleton/etc/profile.d/pkgsrc.sh

@ -15,8 +15,10 @@ fi
if [ -x /usr/pkg/share/man ]
then MANPATH=/usr/pkg/share/man:${MANPATH}
fi
if [ -x /usr/pkg/man ]
then MANPATH=/usr/pkg/man:${MANPATH}
fi
if [ -x /usr/pkg/share/info ]
then INFOPATH=/usr/pkg/share/info:${INFOPATH}
fi
PKG_PATH=https://hitchhiker-linux.org/pub/${OS_VERSION}/${arch}/packages
export PATH PKG_CONFIG_PATH MANPATH INFOPATH PKG_PATH
export PATH PKG_CONFIG_PATH MANPATH INFOPATH

12
world/fs_skeleton/etc/zshenv

@ -1,14 +1,12 @@
if [ $UID = 0 ]
then PATH=/usr/bin:/usr/sbin:/bin:/sbin
if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:/usr/local/sbin:${PATH} ; fi
then PATH=/usr/bin:/usr/sbin:/bin:/sbin
if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:/usr/local/sbin:${PATH} ; fi
else
PATH=/usr/bin:/bin
if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:${PATH} ; fi
fi
if [ -d ${HOME}/bin ]
then PATH=${HOME}/bin:PATH
if [ -d /usr/local/bin ] ; then PATH=/usr/local/bin:${PATH} ; fi
fi
if [ -d ${HOME}/bin ] ; then PATH=${HOME}/bin:${PATH} ; fi
export PATH
for script in /etc/zshenv.d/*.zsh
do source ${script}
do source ${script}
done

8
world/fs_skeleton/etc/zshenv.d/dircolors.zsh

@ -1,8 +1,8 @@
# Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
if [ -f "/etc/dircolors" ] ; then
eval $(dircolors -b /etc/dircolors)
if [ -f "/etc/dircolors" ]
then eval $(dircolors -b /etc/dircolors)
fi
if [ -f "$HOME/.dircolors" ] ; then
eval $(dircolors -b $HOME/.dircolors)
if [ -f "$HOME/.dircolors" ]
then eval $(dircolors -b $HOME/.dircolors)
fi

3
world/fs_skeleton/etc/zshenv.d/pkgsrc.zsh

@ -15,6 +15,9 @@ fi
if [ -x /usr/pkg/share/man ]
then MANPATH=/usr/pkg/share/man:${MANPATH}
fi
if [ -x /usr/pkg/man ]
then MANPATH=/usr/pkg/man:${MANPATH}
fi
if [ -x /usr/pkg/share/info ]
then INFOPATH=/usr/pkg/share/info:${INFOPATH}
fi

2
world/libcap/Makefile

@ -11,6 +11,6 @@ makeflags += lib=lib
export BUILD_CC = gcc
export SYSROOT = $(DESTDIR)
export CROSS_COMPILE = $(tgt)-
export COPTS = -O2 --sysroot=$(DESTDIR)
export COPTS = -O2
post_install = chmod 755 $(DESTDIR)/lib/libcap.so.$(libcap_version)
include targets.mk

Loading…
Cancel
Save