diff options
| -rw-r--r-- | package/base-files/Makefile | 8 | ||||
| -rw-r--r-- | package/util-linux/Makefile | 1 | ||||
| -rwxr-xr-x | scripts/install-rpi.sh | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index fa059f2e7..1c31ba485 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:= 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) || \ diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 118d48101..4653913bf 100644 --- a/package/util-linux/Makefile +++ b/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 diff --git a/scripts/install-rpi.sh b/scripts/install-rpi.sh index 0cf88cf4c..244e6702f 100755 --- a/scripts/install-rpi.sh +++ b/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 |