diff options
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 17 | ||||
| -rwxr-xr-x | package/base-files/src/usr/share/udhcpc/default.script | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 560158226..421f355c4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 17 +PKG_RELEASE:= 20 PKG_SECTION:= base PKG_DESCR:= basic filesystem structure and scripts @@ -65,13 +65,24 @@ endif ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab rm -rf $(IDIR_BASE_FILES)/var ln -sf tmp $(IDIR_BASE_FILES)/var - test -z $(ADK_PASSWORD) || \ + test -z $(ADK_RUNTIME_HOSTNAME) || \ + echo $(ADK_RUNTIME_HOSTNAME) > \ + $(IDIR_BASE_FILES)/etc/hostname + test -z $(ADK_RUNTIME_PASSWORD) || \ $(SED) 's,\*NP\*,'"$$(${STAGING_TOOLS}/bin/mkcrypt \ - ${ADK_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow + ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz endif +rebuild: + @if [ -f ${TOPDIR}/.rebuild.${PKG_NAME} ];then \ + rm ${WRKBUILD}/.build_done; \ + rm ${TOPDIR}/.rebuild.${PKG_NAME}; \ + fi + +fake: rebuild + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script index 02e4a7a3c..68c603496 100755 --- a/package/base-files/src/usr/share/udhcpc/default.script +++ b/package/base-files/src/usr/share/udhcpc/default.script @@ -4,7 +4,7 @@ if [[ -z $1 ]]; then exit 1 fi -RESOLV_CONF=/tmp/resolv.conf +RESOLV_CONF=/etc/resolv.conf case $1 in (deconfig) |