From 0260050539f98174bce73824e347fa851fe45d10 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 7 Dec 2015 14:55:45 -0600
Subject: [PATCH] bb.org: replace --beagleboard.org-production with deb package
doc-beaglebone-getting-started
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
beagleboard.org_image.sh | 12 ++--
beagleboard.org_jessie_image.sh | 17 +++--
.../bb.org-debian-jessie-lxqt-2gb-v4.1.conf | 2 +-
.../bb.org-debian-jessie-lxqt-4gb-v3.14.conf | 2 +-
.../bb.org-debian-jessie-lxqt-4gb-v4.1.conf | 2 +-
configs/bb.org-debian-jessie-lxqt-4gb.conf | 2 +-
.../bb.org-debian-jessie-tester-2gb-v4.1.conf | 2 +-
configs/bb.org-debian-wheezy-lxde-2gb.conf | 2 +-
configs/bb.org-debian-wheezy-lxde-4gb.conf | 2 +-
publish/bb.org_4gb_stable.sh | 9 +--
publish/rcn-ee_bb.org-stable.sh | 17 +++--
publish/rcn-ee_bb.org-test.sh | 17 +++--
publish/rcn-ee_bb.org-wheezy.sh | 15 ++--
publish/rcn-ee_scaleway_bb.org-stable.sh | 17 +++--
readme.md | 6 +-
tools/setup_sdcard.sh | 70 ++-----------------
16 files changed, 63 insertions(+), 131 deletions(-)
diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index e9360e304..d530de6ce 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -56,27 +56,27 @@ compress_img () {
base_rootfs="${debian_lxde_4gb_stable}"
pre_generic_img
-options="--img-4gb BBB-blank-eMMC-flasher-\${base_rootfs} --dtb bbb-blank-eeprom --beagleboard.org-production --boot_label BEAGLEBONE --enable-systemd --rootfs_label rootfs --bbb-flasher --hostname beaglebone"
+options="--img-4gb BBB-blank-eMMC-flasher-\${base_rootfs} --dtb bbb-blank-eeprom --enable-systemd --bbb-flasher --hostname beaglebone"
generic_img
-options="--img-4gb BBB-eMMC-flasher-\${base_rootfs} --dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE --enable-systemd --rootfs_label rootfs --bbb-flasher --bbb-old-bootloader-in-emmc --hostname beaglebone"
+options="--img-4gb BBB-eMMC-flasher-\${base_rootfs} --dtb beaglebone --enable-systemd rootfs --bbb-flasher --bbb-old-bootloader-in-emmc --hostname beaglebone"
generic_img
-options="--img-4gb bone-\${base_rootfs} --dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE --enable-systemd --bbb-old-bootloader-in-emmc --hostname beaglebone"
+options="--img-4gb bone-\${base_rootfs} --dtb beaglebone --enable-systemd --bbb-old-bootloader-in-emmc --hostname beaglebone"
generic_img
###lxde images: (BBB: 2GB eMMC)
base_rootfs="${debian_lxde_stable}"
pre_generic_img
-options="--img-2gb BBB-eMMC-flasher-\${base_rootfs} --dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE --enable-systemd --rootfs_label rootfs --bbb-flasher --bbb-old-bootloader-in-emmc --hostname beaglebone"
+options="--img-2gb BBB-eMMC-flasher-\${base_rootfs} --dtb beaglebone --enable-systemd --bbb-flasher --bbb-old-bootloader-in-emmc --hostname beaglebone"
generic_img
###console images: (also single partition)
base_rootfs="${debian_console_stable}"
pre_generic_img
-options="--img-2gb BBB-eMMC-flasher-\${base_rootfs} --dtb beaglebone --boot_label BEAGLEBONE --enable-systemd --bbb-flasher --bbb-old-bootloader-in-emmc --hostname beaglebone"
+options="--img-2gb BBB-eMMC-flasher-\${base_rootfs} --dtb beaglebone --enable-systemd --bbb-flasher --bbb-old-bootloader-in-emmc --hostname beaglebone"
generic_img
-options="--img-2gb bone-\${base_rootfs} --dtb beaglebone --boot_label BEAGLEBONE --enable-systemd --bbb-old-bootloader-in-emmc --hostname beaglebone"
+options="--img-2gb bone-\${base_rootfs} --dtb beaglebone --enable-systemd --bbb-old-bootloader-in-emmc --hostname beaglebone"
generic_img
###archive *.tar
diff --git a/beagleboard.org_jessie_image.sh b/beagleboard.org_jessie_image.sh
index 7a656a57c..de1a5a459 100755
--- a/beagleboard.org_jessie_image.sh
+++ b/beagleboard.org_jessie_image.sh
@@ -13,19 +13,18 @@ debian_jessie_console="debian-8.2-console-armhf-${time}"
archive="xz -z -8 -v"
-beaglebone="--dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc --hostname beaglebone"
-bb_blank_flasher="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-beaglebone_console="--dtb beaglebone --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone_console="--dtb beaglebone --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-bb_blank_flasher_console="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher_console="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-arduino_tre="--dtb am335x-arduino-tre --beagleboard.org-production --boot_label ARDUINO-TRE \
+arduino_tre="--dtb am335x-arduino-tre --boot_label ARDUINO-TRE \
--rootfs_label rootfs --hostname arduino-tre"
omap3_beagle_xm="--dtb omap3-beagle-xm --hostname BeagleBoard"
diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
index e132436bf..2aec428f9 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
@@ -53,7 +53,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.13-ti-r35 bb-customizations \
-am335x-pru-package c9-core-installer \
+am335x-pru-package c9-core-installer doc-beaglebone-getting-started \
cmst compton-conf device-tree-compiler libfm-tools libgl1-mesa-dri \
lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session obconf \
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
index 9c997b216..a085a1e47 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
@@ -59,7 +59,7 @@ repo_rcnee_pkg_list="linux-image-3.14.55-ti-r78 linux-headers-3.14.55-ti-r78 bb-
bb-customizations \
am335x-pru-package ap-hotspot \
c9-core-installer chromium-browser cmst compton-conf device-tree-compiler \
-libfm-tools libgl1-mesa-dri libsoc-dev \
+libfm-tools libgl1-mesa-dri libsoc-dev doc-beaglebone-getting-started \
libsoc2 lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session lxqt-sudo \
obconf pcmanfm-qt qps qterminal qupzilla rcn-ee-archive-keyring \
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
index 7adaac2ca..4de3615a8 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
@@ -56,7 +56,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.13-ti-r35 linux-headers-4.1.13-ti-r35 \
-bb-customizations \
+bb-customizations doc-beaglebone-getting-started \
am335x-pru-package ap-hotspot ipumm-dra7xx-installer vpdma-dra7xx-installer \
c9-core-installer chromium-browser cmst compton-conf device-tree-compiler dsptop \
firmware-am57xx-opencl-monitor libfm-tools libgl1-mesa-dri libsoc-dev \
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb.conf b/configs/bb.org-debian-jessie-lxqt-4gb.conf
index e616415f3..278307b35 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb.conf
@@ -55,7 +55,7 @@ rfs_ssh_user_pass="enable"
##
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list="linux-image-3.8.13-bone79 bb-customizations \
+repo_rcnee_pkg_list="linux-image-3.8.13-bone79 bb-customizations doc-beaglebone-getting-started \
am335x-pru-package ap-hotspot ipumm-dra7xx-installer vpdma-dra7xx-installer c9-core-installer chromium-browser \
cmst compton-conf dart-1.10 device-tree-compiler libfm-tools libgl1-mesa-dri libsoc-dev \
libsoc2 lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
diff --git a/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf b/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
index 81fab601d..cd668e83a 100644
--- a/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
@@ -52,7 +52,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.13-ti-r35 bb-customizations \
-am335x-pru-package c9-core-installer \
+am335x-pru-package c9-core-installer doc-beaglebone-getting-started \
device-tree-compiler \
rcn-ee-archive-keyring \
tiomapconf"
diff --git a/configs/bb.org-debian-wheezy-lxde-2gb.conf b/configs/bb.org-debian-wheezy-lxde-2gb.conf
index 6242e2257..62e5fa858 100644
--- a/configs/bb.org-debian-wheezy-lxde-2gb.conf
+++ b/configs/bb.org-debian-wheezy-lxde-2gb.conf
@@ -51,7 +51,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-3.8.13-bone79 bb-customizations \
-acpi-support-base \
+acpi-support-base doc-beaglebone-getting-started \
c9-core-installer device-tree-compiler nodejs nodejs-legacy \
npm rcn-ee-archive-keyring \
xinput-calibrator xserver-xorg-video-modesetting"
diff --git a/configs/bb.org-debian-wheezy-lxde-4gb.conf b/configs/bb.org-debian-wheezy-lxde-4gb.conf
index 1f45028cf..aa88f239f 100644
--- a/configs/bb.org-debian-wheezy-lxde-4gb.conf
+++ b/configs/bb.org-debian-wheezy-lxde-4gb.conf
@@ -53,7 +53,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-3.8.13-bone79 bb-customizations \
-acpi-support-base am335x-pru-package \
+acpi-support-base am335x-pru-package doc-beaglebone-getting-started \
c9-core-installer device-tree-compiler libsoc-dev libsoc2 nodejs nodejs-legacy \
npm rcn-ee-archive-keyring ti-pru-cgt-installer tiomapconf xinput-calibrator \
xserver-xorg-video-modesetting"
diff --git a/publish/bb.org_4gb_stable.sh b/publish/bb.org_4gb_stable.sh
index 95eb3382d..220641fc6 100755
--- a/publish/bb.org_4gb_stable.sh
+++ b/publish/bb.org_4gb_stable.sh
@@ -58,8 +58,7 @@ image_name="debian-7.9-lxde-4gb-armhf-${time}"
size="4gb"
options="--img-4gb bone-${image_name} --dtb beaglebone \
---beagleboard.org-production --boot_label BEAGLEBONE --enable-systemd \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+--enable-systemd --bbb-old-bootloader-in-emmc --hostname beaglebone"
./RootStock-NG.sh -c bb.org-debian-wheezy-lxde-4gb
build_and_upload_image
@@ -69,8 +68,7 @@ build_and_upload_image
#size="2gb"
#options="--img-2gb bone-${image_name} --dtb beaglebone \
-#--beagleboard.org-production --boot_label BEAGLEBONE \
-#--rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+#--bbb-old-bootloader-in-emmc --hostname beaglebone"
#./RootStock-NG.sh -c bb.org-debian-jessie-lxqt-2gb-v4.1
#build_and_upload_image
@@ -81,8 +79,7 @@ image_name="debian-8.2-tester-2gb-armhf-${time}"
size="2gb"
options="--img-2gb bone-${image_name} --dtb beaglebone \
---beagleboard.org-production --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+--bbb-old-bootloader-in-emmc --hostname beaglebone"
./RootStock-NG.sh -c bb.org-debian-jessie-tester-2gb-v4.1
build_and_upload_image
diff --git a/publish/rcn-ee_bb.org-stable.sh b/publish/rcn-ee_bb.org-stable.sh
index 4a2364a4d..7fa4d1be3 100755
--- a/publish/rcn-ee_bb.org-stable.sh
+++ b/publish/rcn-ee_bb.org-stable.sh
@@ -26,19 +26,18 @@ debian_jessie_usbflasher="debian-8.2-usbflasher-armhf-${time}"
archive="xz -z -8"
-beaglebone="--dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone="--dtb beaglebone ---bbb-old-bootloader-in-emmc --hostname beaglebone"
-bb_blank_flasher="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-beaglebone_console="--dtb beaglebone --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone_console="--dtb beaglebone --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-bb_blank_flasher_console="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher_console="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-arduino_tre="--dtb am335x-arduino-tre --beagleboard.org-production --boot_label ARDUINO-TRE \
+arduino_tre="--dtb am335x-arduino-tre --boot_label ARDUINO-TRE \
--rootfs_label rootfs --hostname arduino-tre"
omap3_beagle_xm="--dtb omap3-beagle-xm --hostname BeagleBoard"
diff --git a/publish/rcn-ee_bb.org-test.sh b/publish/rcn-ee_bb.org-test.sh
index 970893029..c470f2196 100755
--- a/publish/rcn-ee_bb.org-test.sh
+++ b/publish/rcn-ee_bb.org-test.sh
@@ -26,19 +26,18 @@ debian_jessie_usbflasher="debian-8.2-usbflasher-armhf-${time}"
archive="xz -z -8"
-beaglebone="--dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc --hostname beaglebone"
-bb_blank_flasher="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-beaglebone_console="--dtb beaglebone --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone_console="--dtb beaglebone --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-bb_blank_flasher_console="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher_console="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-arduino_tre="--dtb am335x-arduino-tre --beagleboard.org-production --boot_label ARDUINO-TRE \
+arduino_tre="--dtb am335x-arduino-tre --boot_label ARDUINO-TRE \
--rootfs_label rootfs --hostname arduino-tre"
omap3_beagle_xm="--dtb omap3-beagle-xm --hostname BeagleBoard"
diff --git a/publish/rcn-ee_bb.org-wheezy.sh b/publish/rcn-ee_bb.org-wheezy.sh
index 606b2b917..195cb4105 100755
--- a/publish/rcn-ee_bb.org-wheezy.sh
+++ b/publish/rcn-ee_bb.org-wheezy.sh
@@ -22,17 +22,16 @@ debian_wheezy_console="debian-7.9-console-armhf-${time}"
archive="xz -z -8"
-beaglebone="--dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc --hostname beaglebone"
-bb_blank_flasher="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-beaglebone_console="--dtb beaglebone --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone_console="--dtb beaglebone --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-bb_blank_flasher_console="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher_console="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
cat > ${DIR}/deploy/gift_wrap_final_images.sh <<-__EOF__
#!/bin/bash
diff --git a/publish/rcn-ee_scaleway_bb.org-stable.sh b/publish/rcn-ee_scaleway_bb.org-stable.sh
index ce3c62050..262fb95fc 100755
--- a/publish/rcn-ee_scaleway_bb.org-stable.sh
+++ b/publish/rcn-ee_scaleway_bb.org-stable.sh
@@ -32,19 +32,18 @@ debian_jessie_usbflasher="debian-8.2-usbflasher-armhf-${time}"
archive="xz -z -8"
-beaglebone="--dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone="--dtb beaglebone --bbb-old-bootloader-in-emmc --hostname beaglebone"
-bb_blank_flasher="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---rootfs_label rootfs --bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-beaglebone_console="--dtb beaglebone --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+beaglebone_console="--dtb beaglebone --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-bb_blank_flasher_console="--dtb bbb-blank-eeprom --boot_label BEAGLEBONE \
---bbb-old-bootloader-in-emmc --hostname beaglebone"
+bb_blank_flasher_console="--dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc \
+--hostname beaglebone"
-arduino_tre="--dtb am335x-arduino-tre --beagleboard.org-production --boot_label ARDUINO-TRE \
+arduino_tre="--dtb am335x-arduino-tre --boot_label ARDUINO-TRE \
--rootfs_label rootfs --hostname arduino-tre"
omap3_beagle_xm="--dtb omap3-beagle-xm --hostname BeagleBoard"
diff --git a/readme.md b/readme.md
index d7cabda16..59f77ac23 100644
--- a/readme.md
+++ b/readme.md
@@ -40,8 +40,7 @@ Images:
Flasher:
sudo ./setup_sdcard.sh --img-4gb BBB-eMMC-flasher-debian-7.X-201Y-MM-DD \
- --dtb beaglebone --beagleboard.org-production --boot_label BEAGLEBONE \
- --rootfs_label eMMC-Flasher --enable-systemd --bbb-flasher \
+ --dtb beaglebone --enable-systemd --bbb-flasher \
--bbb-old-bootloader-in-emmc
xz -z -8 -v BBB-eMMC-flasher-debian-7.X-201Y-MM-DD-4gb.img
@@ -49,8 +48,7 @@ Flasher:
2GB, microSD:
sudo ./setup_sdcard.sh --img-2gb bone-debian-7.X-201Y-MM-DD --dtb beaglebone \
- --beagleboard.org-production --boot_label BEAGLEBONE --enable-systemd \
- --bbb-old-bootloader-in-emmc
+ --enable-systemd --bbb-old-bootloader-in-emmc
xz -z -8 -v bone-debian-7.X-201Y-MM-DD-2gb.img
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index 8d56a8749..35e3b9724 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -568,9 +568,6 @@ create_partitions () {
echo "Using sfdisk to create partition layout"
echo "Version: `LC_ALL=C sfdisk --version`"
echo "-----------------------------"
- if [ "x${bborg_production}" = "xenable" ] ; then
- conf_boot_endmb="96"
- fi
sfdisk_partition_layout
;;
dd_uboot_boot)
@@ -593,15 +590,8 @@ create_partitions () {
dd_spl_uboot_boot
dd_uboot_boot
bootloader_installed=1
- if [ "x${bborg_production}" = "xenable" ] ; then
- conf_boot_endmb="96"
- conf_boot_fstype="fat"
- sfdisk_fstype="0xE"
- sfdisk_partition_layout
- else
- sfdisk_single_partition_layout
- media_rootfs_partition=1
- fi
+ sfdisk_single_partition_layout
+ media_rootfs_partition=1
;;
*)
echo "Using sfdisk to create partition layout"
@@ -653,50 +643,6 @@ create_partitions () {
fi
}
-boot_git_tools () {
- if [ ! "${offline}" ] && [ "x${bborg_production}" = "xenable" ] ; then
-
- echo "Debug: Adding BeagleBone drivers from: https://github.com/beagleboard/beaglebone-getting-started"
- #Not planning to change these too often, once pulled, remove .git stuff...
- mkdir -p ${TEMPDIR}/drivers/
- git clone https://github.com/beagleboard/beaglebone-getting-started.git ${TEMPDIR}/drivers/ --depth 1
- if [ -f ${TEMPDIR}/drivers/.git/config ] ; then
- rm -rf ${TEMPDIR}/drivers/.git/ || true
- fi
-
- if [ -d ${TEMPDIR}/drivers/App ] ; then
- mv ${TEMPDIR}/drivers/App ${TEMPDIR}/disk/
- fi
- if [ -d ${TEMPDIR}/drivers/Drivers ] ; then
- mv ${TEMPDIR}/drivers/Drivers ${TEMPDIR}/disk/
- fi
- if [ -d ${TEMPDIR}/drivers/Docs ] ; then
- mv ${TEMPDIR}/drivers/Docs ${TEMPDIR}/disk/
- fi
- if [ -d ${TEMPDIR}/drivers/scripts ] ; then
- mv ${TEMPDIR}/drivers/scripts ${TEMPDIR}/disk/
- fi
- if [ -f ${TEMPDIR}/drivers/autorun.inf ] ; then
- mv ${TEMPDIR}/drivers/autorun.inf ${TEMPDIR}/disk/
- fi
- if [ -f ${TEMPDIR}/drivers/LICENSE.txt ] ; then
- mv ${TEMPDIR}/drivers/LICENSE.txt ${TEMPDIR}/disk/
- fi
- if [ -f ${TEMPDIR}/drivers/README.htm ] ; then
- mv ${TEMPDIR}/drivers/README.htm ${TEMPDIR}/disk/
- fi
- if [ -f ${TEMPDIR}/drivers/README.md ] ; then
- mv ${TEMPDIR}/drivers/README.md ${TEMPDIR}/disk/
- fi
- if [ -f ${TEMPDIR}/drivers/START.htm ] ; then
- mv ${TEMPDIR}/drivers/START.htm ${TEMPDIR}/disk/
- fi
-
- sync
- echo "-----------------------------"
- fi
-}
-
populate_boot () {
echo "Populating Boot Partition"
echo "-----------------------------"
@@ -846,8 +792,6 @@ populate_boot () {
fi
fi
- boot_git_tools
-
cd ${TEMPDIR}/disk
sync
cd "${DIR}"/
@@ -1287,10 +1231,11 @@ populate_rootfs () {
echo " network 192.168.7.0" >> ${wfile}
echo " gateway 192.168.7.1" >> ${wfile}
- if [ ! "x${bborg_production}" = "xenable" ] ; then
- #wheezy
+ if [ -f ${TEMPDIR}/disk/var/www/index.html ; then
rm -f ${TEMPDIR}/disk/var/www/index.html || true
- #jessie
+ fi
+
+ if [ -f ${TEMPDIR}/disk/var/www/html/index.html ; then
rm -f ${TEMPDIR}/disk/var/www/html/index.html || true
fi
sync
@@ -1654,9 +1599,6 @@ while [ ! -z "$1" ] ; do
--bbb-flasher|--emmc-flasher)
emmc_flasher="enable"
;;
- --beagleboard.org-production)
- bborg_production="enable"
- ;;
--bbb-old-bootloader-in-emmc)
bbb_old_bootloader_in_emmc="enable"
;;
--
GitLab