Selaa lähdekoodia

use manual config for base-files, fix fancy prompt

Waldemar Brodkorb 14 vuotta sitten
vanhempi
commit
932272554e

+ 15 - 1
package/base-files/Config.in.manual

@@ -1,5 +1,19 @@
+config ADK_COMPILE_BASE_FILES
+	tristate
+	depends on ADK_PACKAGE_BASE_FILES
+	default n
+
+config ADK_PACKAGE_BASE_FILES
+	prompt "base-files............. basic filesystem structure and scripts"
+	tristate
+	default y if !ADK_TOOLCHAIN_ONLY
+	select ADK_COMPILE_BASE_FILES
+	depends on !ADK_TOOLCHAIN_ONLY
+	help
+	  basic filesystem structure and scripts
+
 config ADK_PACKAGE_CONFIG_IN_ETC
-	prompt ".config in /etc.................. include buildsystem configuration in image"
+	prompt ".config in /etc...... include buildsystem configuration in image"
 	bool
 	depends on ADK_PACKAGE_BASE_FILES
 	default y if !ADK_TOOLCHAIN_ONLY

+ 2 - 4
package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		22
+PKG_RELEASE:=		23
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -17,9 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-PKGDFLT_BASE_FILES=	y if !ADK_TOOLCHAIN_ONLY
-CFLINE_BASE_FILES:=	depends on !ADK_TOOLCHAIN_ONLY
-
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -77,6 +74,7 @@ endif
 	    echo $(ADK_TARGET) > $(IDIR_BASE_FILES)/etc/adktarget
 ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz
+	chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz
 endif
 
 rebuild:

+ 2 - 2
package/base-files/src/etc/profile

@@ -1,9 +1,9 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export TERM=vt220
 if [[ $(id -u) = 0 ]]; then
-	export PS1='\u@\h:\w\# '
+	export PS1='`whoami`@`hostname`:`pwd` # '
 else
-	export PS1='\u@\h:\w\$ '
+	export PS1='`whoami`@`hostname`:`pwd` $ '
 fi
 cat /etc/banner 2>&-
 [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi

+ 1 - 1
package/pkgmaker

@@ -84,7 +84,7 @@ for dn in */Makefile; do
 	echo "$dn/Config.in.manual ${PKG_SECTION:=none}" >>../package_sections
 
 	# skip if we take care of this one manually
-	[[ $dn != "base-files" ]] && [[ -s Config.in.manual ]] && { cd ..; continue; }
+	[[ -s Config.in.manual ]] && { cd ..; continue; }
 
 	exec 4>../pkgconfigs.d/$dn/Config.in