summaryrefslogtreecommitdiff
path: root/package/adkinstall
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
commit220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch)
tree406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/adkinstall
parent38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff)
rework architecture / embedded systems concept
Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package/adkinstall')
-rw-r--r--package/adkinstall/Makefile15
-rw-r--r--package/adkinstall/src/adkinstall17
-rw-r--r--package/adkinstall/src/adkinstall.foxg203
-rw-r--r--package/adkinstall/src/adkinstall.rb4xx3
-rw-r--r--package/adkinstall/src/adkinstall.rb53217
5 files changed, 32 insertions, 23 deletions
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index 5a64ae14d..d4202d78a 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -5,13 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= adkinstall
PKG_VERSION:= 1.0
-PKG_RELEASE:= 5
+PKG_RELEASE:= 7
PKG_DESCR:= openadk installer
PKG_SECTION:= base
PKG_DEPENDS:= parted sfdisk e2fsprogs
-PKG_URL:= http://www.openadk.org/
-
-PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20
+PKG_URL:= http://openadk.org/
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
NO_DISTFILES:= 1
@@ -29,13 +27,16 @@ pre-configure:
do-install:
${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin
-ifeq ($(ADK_LINUX_MIPS_RB532),y)
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
${INSTALL_BIN} ./src/adkinstall.rb532 \
$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_LINUX_ARM_FOXG20),y)
+else ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
${INSTALL_BIN} ./src/adkinstall.foxg20 \
$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_LINUX_MIPS_RB4XX),y)
+else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB411),y)
+ ${INSTALL_BIN} ./src/adkinstall.rb4xx \
+ $(IDIR_ADKINSTALL)/sbin/adkinstall
+else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y)
${INSTALL_BIN} ./src/adkinstall.rb4xx \
$(IDIR_ADKINSTALL)/sbin/adkinstall
else
diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall
index 62ab3225a..b9b0e3109 100644
--- a/package/adkinstall/src/adkinstall
+++ b/package/adkinstall/src/adkinstall
@@ -52,11 +52,18 @@ if [ $rescue -eq 1 ];then
rootp=3
cfgfsp=4
start=2
- parted -s /dev/sda unit cyl mkpartfs primary ext2 0 1
- parted -s /dev/sda unit cyl mkpartfs primary ext2 1 2
+ parted -s /dev/sda unit cyl mkpart primary ext2 0 1
+ check_exit
+ mke2fs /dev/sda1
+ check_exit
+ parted -s /dev/sda unit cyl mkpart primary ext2 1 2
+ check_exit
+ mke2fs /dev/sda2
check_exit
fi
-parted -s /dev/sda unit cyl mkpartfs primary ext2 $start $rootsize
+parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
+check_exit
+mke2fs /dev/sda1
check_exit
parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
check_exit
@@ -124,7 +131,7 @@ menuentry "GNU/Linux (OpenADK)" {
recordfail
insmod ext2
set root=(hd0,3)
- linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10
+ linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
}
menuentry "GNU/Linux (OpenADK) Rescue Mode" {
@@ -145,7 +152,7 @@ terminal_input serial
menuentry "GNU/Linux (OpenADK)" {
insmod ext2
set root=(hd0,1)
- linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10
+ linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
}
EOF
fi
diff --git a/package/adkinstall/src/adkinstall.foxg20 b/package/adkinstall/src/adkinstall.foxg20
index 4b0251309..61ab65d9d 100644
--- a/package/adkinstall/src/adkinstall.foxg20
+++ b/package/adkinstall/src/adkinstall.foxg20
@@ -17,7 +17,7 @@ parted -s /dev/mmcblk0 mklabel msdos
sleep 2
maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
rootsize=$(($maxsize-2))
-parted -s /dev/mmcblk0 unit cyl mkpartfs primary fat32 0 5
+parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5
parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize
parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize
parted -s /dev/mmcblk0 set 1 boot on
@@ -25,6 +25,7 @@ sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1
sleep 2
sync
printf "Creating ext2 filesystem\n"
+mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1
mke2fs /dev/mmcblk0p2 >/dev/null 2>&1
tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1
mount -t ext2 /dev/mmcblk0p2 /mnt
diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx
index f96cc7f05..afaea0c39 100644
--- a/package/adkinstall/src/adkinstall.rb4xx
+++ b/package/adkinstall/src/adkinstall.rb4xx
@@ -1,6 +1,5 @@
#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto
-# a NAND device
+# installs a rootfs tar archive from OpenADK onto a NAND device
# special script for routerboard rb4xx
if [ -z $1 ];then
diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532
index e71848325..9f1af0bb6 100644
--- a/package/adkinstall/src/adkinstall.rb532
+++ b/package/adkinstall/src/adkinstall.rb532
@@ -14,12 +14,6 @@ if [ -z $2 ];then
printf "Please give your root tar archive as second parameter\n"
exit 1
fi
-if [ $cfinstall -eq 1 ];then
- if [ -z $3 ];then
- printf "Please give your kernel as third parameter\n"
- exit 1
- fi
-fi
case $1 in
nand)
nandinstall=1
@@ -34,6 +28,13 @@ case $1 in
esac
if [ $cfinstall -eq 1 ];then
+ if [ -z $3 ];then
+ printf "Please give your kernel as third parameter\n"
+ exit 1
+ fi
+fi
+
+if [ $cfinstall -eq 1 ];then
# create empty partition table
printf "Creating partition scheme\n"
parted -s /dev/sda mklabel msdos
@@ -41,12 +42,13 @@ if [ $cfinstall -eq 1 ];then
maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
rootsize=$(($maxsize-2))
parted -s /dev/sda unit cyl mkpart primary ext2 0 1
- parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize
+ parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize
parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
parted -s /dev/sda set 1 boot on
sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
sleep 2
+ mke2fs /dev/sda2
sync
printf "Installing kernel\n"
dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
@@ -71,7 +73,6 @@ fi
chmod 1777 /mnt/tmp
chmod 4755 /mnt/bin/busybox
-
sync
if [ $nandinstall -eq 1 ];then