diff --git a/3rdparty/packaging/builddeb b/3rdparty/packaging/builddeb
index 35d5a5877d040a6f3db61badd77ed6c991af5dcf..59726243c2ebab1a9263019a5ff8eb759b2fdda7 100644
--- a/3rdparty/packaging/builddeb
+++ b/3rdparty/packaging/builddeb
@@ -37,7 +37,7 @@ create_package() {
s390*)
debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
ppc*)
- debarch=powerpc ;;
+ debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
parisc*)
debarch=hppa ;;
mips*)
@@ -64,7 +64,7 @@ create_package() {
fi
# Create the package
- dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
+ dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
dpkg --build "$pdir" ..
}
@@ -152,18 +152,16 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
rmdir "$tmpdir/lib/modules/$version"
fi
if [ -n "$BUILD_DEBUG" ] ; then
- (
- cd $tmpdir
- for module in $(find lib/modules/ -name *.ko); do
- mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
- # only keep debug symbols in the debug file
- $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
- # strip original module from debug symbols
- $OBJCOPY --strip-debug $module
- # then add a link to those
- $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
- done
- )
+ for module in $(find $tmpdir/lib/modules/ -name *.ko -printf '%P\n'); do
+ module=lib/modules/$module
+ mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
+ # only keep debug symbols in the debug file
+ $OBJCOPY --only-keep-debug $tmpdir/$module $dbg_dir/usr/lib/debug/$module
+ # strip original module from debug symbols
+ $OBJCOPY --strip-debug $tmpdir/$module
+ # then add a link to those
+ $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $tmpdir/$module
+ done
fi
fi
diff --git a/3rdparty/sgx-startup-sysv.sh b/3rdparty/sgx-startup-sysv.sh
index 9c4e553c22f5e47fb375ed9e83b6b1e9fdef549f..1710c38455259e2994196af10d2723269a9b233d 100644
--- a/3rdparty/sgx-startup-sysv.sh
+++ b/3rdparty/sgx-startup-sysv.sh
@@ -11,7 +11,7 @@
case "$1" in
start)
- if [ -d /sys/devices/ocp.*/56000000.sgx ] ; then
+ if [ -d /sys/devices/ocp*/56000000.sgx ] ; then
echo "sgx: Starting PVR"
modprobe -q pvrsrvkm
@@ -36,7 +36,7 @@ start)
fi
;;
reload|force-reload|restart)
- if [ -d /sys/devices/ocp.*/56000000.sgx ] ; then
+ if [ -d /sys/devices/ocp*/56000000.sgx ] ; then
echo "sgx: Restarting PVR"
fi
;;
diff --git a/patch.sh b/patch.sh
index d981d5693a48644435b8502e615f8270325a9001..e03d21706d280d5d04c5bdaa910d4c0a8680223b 100644
--- a/patch.sh
+++ b/patch.sh
@@ -602,7 +602,7 @@ packaging_setup () {
packaging () {
echo "dir: packaging"
- #${git} "${DIR}/patches/packaging/0001-packaging-sync-with-mainline.patch"
+ ${git} "${DIR}/patches/packaging/0001-packaging-sync-with-mainline.patch"
${git} "${DIR}/patches/packaging/0002-deb-pkg-install-dtbs-in-linux-image-package.patch"
#${git} "${DIR}/patches/packaging/0003-deb-pkg-no-dtbs_install.patch"
}
diff --git a/patches/debian-armmp b/patches/debian-armmp
index 3771a7315ca0abebaf4613e4eaa9779efec8148f..6da5d181241d8c365c794135bfba657261283566 100644
--- a/patches/debian-armmp
+++ b/patches/debian-armmp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.16.3 Kernel Configuration
+# Linux/arm 3.16.5 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -5145,7 +5145,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_RX8025 is not set
# CONFIG_RTC_DRV_EM3027 is not set
# CONFIG_RTC_DRV_RV3029C2 is not set
-CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_S5M=y
#
# SPI RTC drivers
@@ -5172,7 +5172,7 @@ CONFIG_RTC_DRV_CMOS=m
# CONFIG_RTC_DRV_DS1511 is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_DS1742 is not set
-CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9052=y
# CONFIG_RTC_DRV_STK17TA8 is not set
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_M48T35 is not set
@@ -5186,17 +5186,17 @@ CONFIG_RTC_DRV_DA9052=m
#
# on-CPU RTC drivers
#
-CONFIG_RTC_DRV_IMXDI=m
-CONFIG_RTC_DRV_OMAP=m
+CONFIG_RTC_DRV_IMXDI=y
+CONFIG_RTC_DRV_OMAP=y
CONFIG_HAVE_S3C_RTC=y
# CONFIG_RTC_DRV_S3C is not set
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
-CONFIG_RTC_DRV_VT8500=m
-CONFIG_RTC_DRV_SUNXI=m
-CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_VT8500=y
+CONFIG_RTC_DRV_SUNXI=y
+CONFIG_RTC_DRV_MV=y
CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC=y
# CONFIG_RTC_DRV_SNVS is not set
# CONFIG_RTC_DRV_MOXART is not set
# CONFIG_RTC_DRV_XGENE is not set
diff --git a/patches/packaging/0001-packaging-sync-with-mainline.patch b/patches/packaging/0001-packaging-sync-with-mainline.patch
new file mode 100644
index 0000000000000000000000000000000000000000..380dd58d1cbd807a0c9d1271dd57f11bf6bb19d2
--- /dev/null
+++ b/patches/packaging/0001-packaging-sync-with-mainline.patch
@@ -0,0 +1,64 @@
+From 1292dab38bb94a540af29e5169d1df9914a03030 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Wed, 15 Oct 2014 14:11:52 -0500
+Subject: [PATCH] packaging: sync with mainline
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ scripts/package/builddeb | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 35d5a58..5972624 100644
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -37,7 +37,7 @@ create_package() {
+ s390*)
+ debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
+ ppc*)
+- debarch=powerpc ;;
++ debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
+ parisc*)
+ debarch=hppa ;;
+ mips*)
+@@ -64,7 +64,7 @@ create_package() {
+ fi
+
+ # Create the package
+- dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
++ dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
+ dpkg --build "$pdir" ..
+ }
+
+@@ -152,18 +152,16 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ rmdir "$tmpdir/lib/modules/$version"
+ fi
+ if [ -n "$BUILD_DEBUG" ] ; then
+- (
+- cd $tmpdir
+- for module in $(find lib/modules/ -name *.ko); do
+- mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
+- # only keep debug symbols in the debug file
+- $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
+- # strip original module from debug symbols
+- $OBJCOPY --strip-debug $module
+- # then add a link to those
+- $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
+- done
+- )
++ for module in $(find $tmpdir/lib/modules/ -name *.ko -printf '%P\n'); do
++ module=lib/modules/$module
++ mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
++ # only keep debug symbols in the debug file
++ $OBJCOPY --only-keep-debug $tmpdir/$module $dbg_dir/usr/lib/debug/$module
++ # strip original module from debug symbols
++ $OBJCOPY --strip-debug $tmpdir/$module
++ # then add a link to those
++ $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $tmpdir/$module
++ done
+ fi
+ fi
+
+--
+2.1.1
+
diff --git a/sgx_create_package.sh b/sgx_create_package.sh
index 6cbf5133256653e01bbcece68f4308619b71568c..4387c89f12c348c49e3a87fa251ec3e32fdb912e 100755
--- a/sgx_create_package.sh
+++ b/sgx_create_package.sh
@@ -80,7 +80,7 @@ install_sgx () {
}
set_sgx_make_vars () {
- source ${DIR}/.CC
+# source ${DIR}/.CC
GRAPHICS_PATH="GRAPHICS_INSTALL_DIR="${DIR}/ignore/ti-sdk-pvr/Graphics_SDK/""
KERNEL_PATH="KERNEL_INSTALL_DIR="${DIR}/KERNEL""
USER_VAR="HOME=/home/${USER}"
diff --git a/tools/host_det.sh b/tools/host_det.sh
index d8aa4fb318bc9e6989321bab1047ba02be7bcc0a..68c8c685b8976b6fa4ddcdbc74dbccb5b400382a 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -65,7 +65,7 @@ redhat_reqs () {
echo "RPM distro version: [${rpm_distro}]"
case "${rpm_distro}" in
- 6.4|6.5)
+ 6.4|6.5|6.6)
echo "-----------------------------"
echo "Warning: RHEL/CentOS [${rpm_distro}] has no [uboot-tools] pkg by default"
echo "add: [EPEL] repo: https://fedoraproject.org/wiki/EPEL"
@@ -78,12 +78,17 @@ redhat_reqs () {
echo "-----------------------------"
echo "Warning: RHEL/CentOS [${rpm_distro}] has no [uboot-tools] pkg by default"
echo "add: [EPEL] repo: https://fedoraproject.org/wiki/EPEL"
- echo "http://download.fedoraproject.org/pub/epel/6/i386/repoview/epel-release.html"
+ echo "http://download.fedoraproject.org/pub/epel/7/x86_64/repoview/epel-release.html"
echo "-----------------------------"
- #pkg="uboot-tools"
- #check_rpm
+ pkg="uboot-tools"
+ check_rpm
+ ;;
+ 19|20|21)
+ pkg="uboot-tools"
+ check_rpm
;;
- 17|18|19|20|21)
+ 17|18)
+ #end of life...
pkg="uboot-tools"
check_rpm
;;