Browse Source

fix some raspberry pi probs

Waldemar Brodkorb 10 years ago
parent
commit
73ff1e6a6c
3 changed files with 7 additions and 6 deletions
  1. 5 3
      package/base-files/Makefile
  2. 0 1
      package/util-linux/Makefile
  3. 2 2
      scripts/install-rpi.sh

+ 5 - 3
package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		87
+PKG_RELEASE:=		88
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -62,9 +62,11 @@ endif
 	rm -rf $(IDIR_BASE_FILES)/var
 	ln -sf tmp $(IDIR_BASE_FILES)/var
 	test -z $(ADK_RUNTIME_SHELL) || \
-	    cat ./files/inittab.shell >> $(IDIR_BASE_FILES)/etc/inittab && \
-		test -z $(ADK_TARGET_WITH_VGA) || \
+	    cat ./files/inittab.shell >> $(IDIR_BASE_FILES)/etc/inittab
+ifeq ($(ADK_TARGET_WITH_VGA),y)
+	test -z $(ADK_RUNTIME_SHELL) || \
 		cat ./files/inittab.shellvga >> $(IDIR_BASE_FILES)/etc/inittab
+endif
 	test -z $(ADK_RUNTIME_GETTY_VGA) || \
 	    cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_GETTY_SERIAL) || \

+ 0 - 1
package/util-linux/Makefile

@@ -13,7 +13,6 @@ PKG_BUILDDEP:=		ncurses pam
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
 PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
-PKG_MULTI:=		1
 
 PKG_ARCH_DEPENDS:=	!m68k
 

+ 2 - 2
scripts/install-rpi.sh

@@ -93,13 +93,13 @@ parted -s $1 unit cyl mkpart primary fat32 -- 0 16
 if [ $datadir -eq 0 ];then
 	parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize
 	parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize
-	sfdisk --change-id $1 3 88
+	sfdisk --change-id $1 3 88 >/dev/null 2>&1
 else
 	parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize
 	parted -s $1 unit cyl mkpart primary ext2 $rootsize $datasize
 	parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize
 	parted -s $1 set 1 boot on
-	sfdisk --change-id $1 4 88
+	sfdisk --change-id $1 4 88 >/dev/null 2>&1
 fi
 sleep 2
 mkfs.vfat ${1}1 >/dev/null