summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/image.mk4
-rw-r--r--package/sash/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/mk/image.mk b/mk/image.mk
index e47a82ac1..442584440 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -58,13 +58,9 @@ image-prepare-post:
mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
done; \
fi
-ifeq (${ADK_ROOTSH_SASH},)
$(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
-endif
-ifeq (${ADK_BINSH_SASH},)
-rm -f ${TARGET_DIR}/bin/sh
ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
-endif
test -z $(GIT) || \
$(GIT) log -1|head -1|sed -e 's#commit ##' \
> $(TARGET_DIR)/etc/.adkversion
diff --git a/package/sash/Makefile b/package/sash/Makefile
index d47d3e991..337cb166c 100644
--- a/package/sash/Makefile
+++ b/package/sash/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= sash
PKG_VERSION:= 1.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_DESCR:= standalone shell
PKG_SECTION:= base/shells
@@ -21,6 +21,6 @@ INSTALL_STYLE:= manual
do-install:
${INSTALL_DIR} ${IDIR_SASH}/bin
- ${INSTALL_BIN} ${WRKBUILD}/sh ${IDIR_SASH}/bin/sh
+ ${INSTALL_BIN} ${WRKBUILD}/sh ${IDIR_SASH}/bin/sash
include ${ADK_TOPDIR}/mk/pkg-bottom.mk