From 25f6c7fc4b01d89db51d2a9382fad99bcff21029 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 17 Apr 2015 11:08:14 -0500
Subject: [PATCH] generial: move lots of things to bb-customizations package
(jessie only)
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
configs/bb.org-debian-jessie-console.conf | 2 +-
.../bb.org-debian-jessie-lxqt-2gb-v3.14.conf | 2 +-
.../bb.org-debian-jessie-lxqt-4gb-v3.14.conf | 2 +-
configs/bb.org-debian-jessie-lxqt-4gb.conf | 2 +-
configs/eewiki_minfs_debian_jessie_armhf.conf | 2 +-
.../rcn-ee_console_debian_jessie_armhf.conf | 2 +-
publish/rcn-ee_bb.org-stable.sh | 23 ++++++++++++++++
scripts/chroot.sh | 13 ++++++----
target/other/dtbo | 10 +++++--
tools/setup_sdcard.sh | 26 ++++++++++---------
10 files changed, 59 insertions(+), 25 deletions(-)
diff --git a/configs/bb.org-debian-jessie-console.conf b/configs/bb.org-debian-jessie-console.conf
index 3ed131a24..6fd949a22 100644
--- a/configs/bb.org-debian-jessie-console.conf
+++ b/configs/bb.org-debian-jessie-console.conf
@@ -43,7 +43,7 @@ rfs_ssh_user_pass="enable"
##
##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list="linux-image-3.14.38-ti-r59 \
+repo_rcnee_pkg_list="linux-image-3.14.38-ti-r59 bb-customizations \
ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
#
repo_rcnee_pkg_version="3.14.38-ti-r59"
diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v3.14.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v3.14.conf
index 0d4b7d1f0..da2c7b12a 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v3.14.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v3.14.conf
@@ -53,7 +53,7 @@ rfs_ssh_user_pass="enable"
##
##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list="linux-image-3.14.38-ti-r59 \
+repo_rcnee_pkg_list="linux-image-3.14.38-ti-r59 bb-customizations \
am335x-pru-package ap-hotspot c9-core-installer \
cmst compton-conf device-tree-compiler libfm-tools libsoc-dev libsoc2 \
lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
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 da00cb690..4bebb059e 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
@@ -53,7 +53,7 @@ rfs_ssh_user_pass="enable"
##
##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list="linux-image-4.0.0-armv7-x1 linux-image-3.14.38-ti-r59 \
+repo_rcnee_pkg_list="linux-image-4.0.0-armv7-x1 linux-image-3.14.38-ti-r59 bb-customizations \
am335x-pru-package ap-hotspot ipumm-dra7xx-installer c9-core-installer \
cmst compton-conf dart-1.9 device-tree-compiler libfm-tools libsoc-dev libsoc2 \
lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb.conf b/configs/bb.org-debian-jessie-lxqt-4gb.conf
index 94a2a085a..817d71554 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb.conf
@@ -53,7 +53,7 @@ rfs_ssh_user_pass="enable"
##
##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list="linux-image-3.8.13-bone71 \
+repo_rcnee_pkg_list="linux-image-3.8.13-bone71 bb-customizations \
am335x-pru-package ap-hotspot ipumm-dra7xx-installer c9-core-installer \
cmst compton-conf dart-1.9 device-tree-compiler libfm-tools libsoc-dev libsoc2 \
lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
diff --git a/configs/eewiki_minfs_debian_jessie_armhf.conf b/configs/eewiki_minfs_debian_jessie_armhf.conf
index 96d33330a..9ccbfb386 100644
--- a/configs/eewiki_minfs_debian_jessie_armhf.conf
+++ b/configs/eewiki_minfs_debian_jessie_armhf.conf
@@ -38,7 +38,7 @@ rfs_ssh_user_pass=""
##
##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list=""
+repo_rcnee_pkg_list="bb-customizations"
include_firmware="enable"
##
#chroot_very_small_image=""
diff --git a/configs/rcn-ee_console_debian_jessie_armhf.conf b/configs/rcn-ee_console_debian_jessie_armhf.conf
index efd804919..2f38edf97 100644
--- a/configs/rcn-ee_console_debian_jessie_armhf.conf
+++ b/configs/rcn-ee_console_debian_jessie_armhf.conf
@@ -41,7 +41,7 @@ rfs_ssh_user_pass="enable"
##
##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
repo_rcnee="enable"
-repo_rcnee_pkg_list="linux-image-4.0.0-armv7-x1 linux-image-3.14.38-ti-r59 \
+repo_rcnee_pkg_list="linux-image-4.0.0-armv7-x1 linux-image-3.14.38-ti-r59 bb-customizations \
ipumm-dra7xx-installer connman rcn-ee-archive-keyring tiomapconf"
#repo_rcnee_pkg_version="3.14.38-ti-r59"
include_firmware="enable"
diff --git a/publish/rcn-ee_bb.org-stable.sh b/publish/rcn-ee_bb.org-stable.sh
index d9ef4481d..2b4e8fde5 100755
--- a/publish/rcn-ee_bb.org-stable.sh
+++ b/publish/rcn-ee_bb.org-stable.sh
@@ -15,10 +15,12 @@ fi
./RootStock-NG.sh -c machinekit-debian-wheezy
./RootStock-NG.sh -c bb.org-debian-jessie-lxqt-2gb-v3.14
./RootStock-NG.sh -c bb.org-debian-jessie-lxqt-4gb-v3.14
+./RootStock-NG.sh -c bb.org-debian-jessie-console
debian_wheezy_machinekit="debian-7.8-machinekit-armhf-${time}"
debian_jessie_lxqt_2gb="debian-jessie-lxqt-2gb-armhf-${time}"
debian_jessie_lxqt_4gb="debian-jessie-lxqt-4gb-armhf-${time}"
+debian_jessie_console="debian-jessie-console-armhf-${time}"
archive="xz -z -8 -v"
@@ -123,10 +125,22 @@ base_rootfs="${debian_jessie_lxqt_2gb}" ; blend="lxqt-2gb" ; extract_base_rootfs
options="--img-2gb BBB-eMMC-flasher-\${base_rootfs} ${beaglebone} --bbb-flasher" ; generate_img
+###console images: (also single partition)
+base_rootfs="${debian_jessie_console}" ; blend="console" ; extract_base_rootfs
+
+options="--img-2gb BBG-blank-eMMC-flasher-\${base_rootfs} ${bb_blank_flasher_console} --bbg-flasher" ; generate_img
+options="--img-2gb BBB-blank-eMMC-flasher-\${base_rootfs} ${bb_blank_flasher_console} --bbb-flasher" ; generate_img
+options="--img-2gb BBB-eMMC-flasher-\${base_rootfs} ${beaglebone_console} --bbb-flasher" ; generate_img
+options="--img-2gb bb-\${base_rootfs} ${omap3_beagle_xm}" ; generate_img
+options="--img-2gb bbx15-\${base_rootfs} ${am57xx_beagle_x15}" ; generate_img
+options="--img-2gb bone-\${base_rootfs} ${beaglebone}" ; generate_img
+options="--img-2gb omap5-uevm-\${base_rootfs} ${omap5_uevm}" ; generate_img
+
###archive *.tar
base_rootfs="${debian_wheezy_machinekit}" ; blend="machinekit" ; archive_base_rootfs
base_rootfs="${debian_jessie_lxqt_4gb}" ; blend="lxqt-4gb" ; archive_base_rootfs
base_rootfs="${debian_jessie_lxqt_2gb}" ; blend="lxqt-2gb" ; archive_base_rootfs
+base_rootfs="${debian_jessie_console}" ; blend="console" ; archive_base_rootfs
###archive *.img
blend="machinekit"
@@ -142,6 +156,15 @@ wfile="omap5-uevm-${debian_jessie_lxqt_4gb}-4gb.img" ; archive_img
blend="lxqt-2gb"
wfile="BBB-eMMC-flasher-${debian_jessie_lxqt_2gb}-2gb.img" ; archive_img
+blend="console"
+wfile="BBB-blank-eMMC-flasher-${debian_jessie_console}-2gb.img" ; archive_img
+wfile="BBG-blank-eMMC-flasher-${debian_jessie_console}-2gb.img" ; archive_img
+wfile="BBB-eMMC-flasher-${debian_jessie_console}-2gb.img" ; archive_img
+wfile="bb-${debian_jessie_console}-2gb.img" ; archive_img
+wfile="bbx15-${debian_jessie_console}-2gb.img" ; archive_img
+wfile="bone-${debian_jessie_console}-2gb.img" ; archive_img
+wfile="omap5-uevm-${debian_console}-2gb.img" ; archive_img
+
__EOF__
chmod +x ${DIR}/deploy/gift_wrap_final_images.sh
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index a25f640b0..463ca3820 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -386,7 +386,6 @@ debian)
distro="Debian"
;;
jessie|stretch)
- sudo cp ${OIB_DIR}/target/init_scripts/systemd-generic-board-startup.service ${tempdir}/lib/systemd/system/generic-board-startup.service
sudo cp ${OIB_DIR}/target/init_scripts/systemd-capemgr.service ${tempdir}/lib/systemd/system/capemgr.service
sudo cp ${OIB_DIR}/target/init_scripts/capemgr ${tempdir}/etc/default/
distro="Debian"
@@ -409,8 +408,10 @@ ubuntu)
esac
if [ -d ${tempdir}/usr/share/initramfs-tools/hooks/ ] ; then
- echo "log: adding: [initramfs-tools hook: dtbo]"
- sudo cp ${OIB_DIR}/target/other/dtbo ${tempdir}/usr/share/initramfs-tools/hooks/
+ if [ ! -f ${tempdir}/usr/share/initramfs-tools/hooks/dtbo ] ; then
+ echo "log: adding: [initramfs-tools hook: dtbo]"
+ sudo cp ${OIB_DIR}/target/other/dtbo ${tempdir}/usr/share/initramfs-tools/hooks/
+ fi
fi
#Backward compatibility, as setup_sdcard.sh expects [lsb_release -si > /etc/rcn-ee.conf]
@@ -1046,8 +1047,10 @@ fi
#add /boot/uEnv.txt update script
if [ -d ${tempdir}/etc/kernel/postinst.d/ ] ; then
- sudo cp -v ${OIB_DIR}/target/other/zz-uenv_txt ${tempdir}/etc/kernel/postinst.d/
- sudo chmod +x ${tempdir}/etc/kernel/postinst.d/zz-uenv_txt
+ if [ ! -f ${tempdir}/etc/kernel/postinst.d/zz-uenv_txt ] ; then
+ sudo cp -v ${OIB_DIR}/target/other/zz-uenv_txt ${tempdir}/etc/kernel/postinst.d/
+ sudo chmod +x ${tempdir}/etc/kernel/postinst.d/zz-uenv_txt
+ fi
fi
if [ -f ${tempdir}/usr/bin/qemu-arm-static ] ; then
diff --git a/target/other/dtbo b/target/other/dtbo
index 45ff4849c..f8bcd59f2 100644
--- a/target/other/dtbo
+++ b/target/other/dtbo
@@ -5,5 +5,11 @@ if [ "$1" = "prereqs" ]; then exit 0; fi
. /usr/share/initramfs-tools/hook-functions
-mkdir -p $DESTDIR/lib/firmware/
-cp -a /lib/firmware/*.dtbo $DESTDIR/lib/firmware/
+if [ -d /lib/firmware/ ] ; then
+ unset check
+ check=$(ls /lib/firmware/ | grep dtbo | head -n 1)
+ if [ ! "x${check}" = "x" ] ; then
+ mkdir -p $DESTDIR/lib/firmware/
+ cp -a /lib/firmware/*.dtbo $DESTDIR/lib/firmware/
+ fi
+fi
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index a50cb1dd4..5933072cc 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1106,18 +1106,20 @@ populate_rootfs () {
fi
if [ -f ${TEMPDIR}/disk/etc/dnsmasq.conf ] ; then
- wfile="/etc/dnsmasq.d/usb0-dhcp"
- echo "#disable DNS by setting port to 0" > ${TEMPDIR}/disk${wfile}
- echo "port=0" >> ${TEMPDIR}/disk${wfile}
- echo "" >> ${TEMPDIR}/disk${wfile}
- echo "interface=usb0" >> ${TEMPDIR}/disk${wfile}
- echo "#one address range" >> ${TEMPDIR}/disk${wfile}
- echo "dhcp-range=192.168.7.1,192.168.7.1" >> ${TEMPDIR}/disk${wfile}
- echo "" >> ${TEMPDIR}/disk${wfile}
- echo "dhcp-option=3" >> ${TEMPDIR}/disk${wfile}
- echo "except-interface=lo" >> ${TEMPDIR}/disk${wfile}
- echo "listen-address=192.168.7.2" >> ${TEMPDIR}/disk${wfile}
- echo "bind-interfaces" >> ${TEMPDIR}/disk${wfile}
+ if [ ! -f ${TEMPDIR}/etc/dnsmasq.d/usb0-dhcp ] ; then
+ wfile="/etc/dnsmasq.d/usb0-dhcp"
+ echo "#disable DNS by setting port to 0" > ${TEMPDIR}/disk${wfile}
+ echo "port=0" >> ${TEMPDIR}/disk${wfile}
+ echo "" >> ${TEMPDIR}/disk${wfile}
+ echo "interface=usb0" >> ${TEMPDIR}/disk${wfile}
+ echo "#one address range" >> ${TEMPDIR}/disk${wfile}
+ echo "dhcp-range=192.168.7.1,192.168.7.1" >> ${TEMPDIR}/disk${wfile}
+ echo "" >> ${TEMPDIR}/disk${wfile}
+ echo "dhcp-option=3" >> ${TEMPDIR}/disk${wfile}
+ echo "except-interface=lo" >> ${TEMPDIR}/disk${wfile}
+ echo "listen-address=192.168.7.2" >> ${TEMPDIR}/disk${wfile}
+ echo "bind-interfaces" >> ${TEMPDIR}/disk${wfile}
+ fi
fi
if [ ! -f ${TEMPDIR}/disk/opt/scripts/boot/generic-startup.sh ] ; then
--
GitLab