diff --git a/patch.sh b/patch.sh
index fff70fe3f7367381cda2aa7a36b1ea1f7d696ad6..49c92a267be0b4bb527ab35de78ad0943bd13252 100644
--- a/patch.sh
+++ b/patch.sh
@@ -141,9 +141,15 @@ aufs () {
cd ../
if [ ! -d ./${aufs_prefix}standalone ] ; then
${git_bin} clone -b aufs${KERNEL_REL} https://github.com/sfjro/${aufs_prefix}standalone --depth=1
+ cd ./${aufs_prefix}standalone/
+ aufs_hash=$(git rev-parse HEAD)
+ cd -
else
rm -rf ./${aufs_prefix}standalone || true
${git_bin} clone -b aufs${KERNEL_REL} https://github.com/sfjro/${aufs_prefix}standalone --depth=1
+ cd ./${aufs_prefix}standalone/
+ aufs_hash=$(git rev-parse HEAD)
+ cd -
fi
cd ./KERNEL/
@@ -155,8 +161,9 @@ aufs () {
cp -v ../${aufs_prefix}standalone/include/uapi/linux/aufs_type.h ./include/uapi/linux/
${git_bin} add .
- ${git_bin} commit -a -m 'merge: aufs' -s
+ ${git_bin} commit -a -m 'merge: aufs' -m "https://github.com/sfjro/${aufs_prefix}standalone/commit/${aufs_hash}" -s
${git_bin} format-patch -5 -o ../patches/aufs/
+ echo "AUFS: https://github.com/sfjro/${aufs_prefix}standalone/commit/${aufs_hash}" > ../patches/git/AUFS
rm -rf ../${aufs_prefix}standalone/ || true
@@ -184,9 +191,15 @@ can_isotp () {
cd ../
if [ ! -d ./can-isotp ] ; then
${git_bin} clone https://github.com/hartkopp/can-isotp --depth=1
+ cd ./can-isotp
+ isotp_hash=$(git rev-parse HEAD)
+ cd -
else
rm -rf ./can-isotp || true
${git_bin} clone https://github.com/hartkopp/can-isotp --depth=1
+ cd ./can-isotp
+ isotp_hash=$(git rev-parse HEAD)
+ cd -
fi
cd ./KERNEL/
@@ -195,8 +208,9 @@ can_isotp () {
cp -v ../can-isotp/net/can/isotp.c net/can/
${git_bin} add .
- ${git_bin} commit -a -m 'merge: can-isotp: https://github.com/hartkopp/can-isotp' -s
+ ${git_bin} commit -a -m 'merge: can-isotp: https://github.com/hartkopp/can-isotp' -m "https://github.com/hartkopp/can-isotp/commit/${isotp_hash}" -s
${git_bin} format-patch -1 -o ../patches/can_isotp/
+ echo "CAN-ISOTP: https://github.com/hartkopp/can-isotp/commit/${isotp_hash}" > ../patches/git/CAN-ISOTP
rm -rf ../can-isotp/ || true
@@ -232,8 +246,9 @@ rt () {
rm -f patch-${rt_patch}.patch.xz
rm -f localversion-rt
${git_bin} add .
- ${git_bin} commit -a -m 'merge: CONFIG_PREEMPT_RT Patch Set' -s
+ ${git_bin} commit -a -m 'merge: CONFIG_PREEMPT_RT Patch Set' -m "patch-${rt_patch}.patch.xz" -s
${git_bin} format-patch -1 -o ../patches/rt/
+ echo "RT: patch-${rt_patch}.patch.xz" > ../patches/git/RT
exit 2
fi
@@ -252,9 +267,15 @@ wireguard () {
cd ../
if [ ! -d ./WireGuard ] ; then
${git_bin} clone https://git.zx2c4.com/WireGuard --depth=1
+ cd ./WireGuard
+ wireguard_hash=$(git rev-parse HEAD)
+ cd -
else
rm -rf ./WireGuard || true
${git_bin} clone https://git.zx2c4.com/WireGuard --depth=1
+ cd ./WireGuard
+ wireguard_hash=$(git rev-parse HEAD)
+ cd -
fi
#cd ./WireGuard/
@@ -266,8 +287,9 @@ wireguard () {
../WireGuard/contrib/kernel-tree/create-patch.sh | patch -p1 || wireguard_fail
${git_bin} add .
- ${git_bin} commit -a -m 'merge: WireGuard' -s
+ ${git_bin} commit -a -m 'merge: WireGuard' -m "https://git.zx2c4.com/WireGuard/commit/${wireguard_hash}" -s
${git_bin} format-patch -1 -o ../patches/WireGuard/
+ echo "WIREGUARD: https://git.zx2c4.com/WireGuard/commit/${wireguard_hash}" > ../patches/git/WIREGUARD
rm -rf ../WireGuard/ || true
@@ -293,9 +315,15 @@ ti_pm_firmware () {
cd ../
if [ ! -d ./ti-amx3-cm3-pm-firmware ] ; then
${git_bin} clone -b ti-v4.1.y-next git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git --depth=1
+ cd ./ti-amx3-cm3-pm-firmware
+ ti_amx3_cm3_hash=$(git rev-parse HEAD)
+ cd -
else
rm -rf ./ti-amx3-cm3-pm-firmware || true
${git_bin} clone -b ti-v4.1.y-next git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git --depth=1
+ cd ./ti-amx3-cm3-pm-firmware
+ ti_amx3_cm3_hash=$(git rev-parse HEAD)
+ cd -
fi
cd ./KERNEL/
@@ -303,8 +331,9 @@ ti_pm_firmware () {
cp -v ../ti-amx3-cm3-pm-firmware/bin/am* ./firmware/
${git_bin} add -f ./firmware/am*
- ${git_bin} commit -a -m 'Add AM335x CM3 Power Managment Firmware' -s
+ ${git_bin} commit -a -m 'Add AM335x CM3 Power Managment Firmware' -m "http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=${ti_amx3_cm3_hash}" -s
${git_bin} format-patch -1 -o ../patches/drivers/ti/firmware/
+ echo "TI_AMX3_CM3: http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=${ti_amx3_cm3_hash}" > ../patches/git/TI_AMX3_CM3
rm -rf ../ti-amx3-cm3-pm-firmware/ || true
@@ -336,9 +365,15 @@ beagleboard_dtbs () {
cd ../
if [ ! -d ./BeagleBoard-DeviceTrees ] ; then
${git_bin} clone -b ${bbdtbs} https://github.com/beagleboard/BeagleBoard-DeviceTrees --depth=1
+ cd ./BeagleBoard-DeviceTrees
+ bbdtbs_hash=$(git rev-parse HEAD)
+ cd -
else
rm -rf ./BeagleBoard-DeviceTrees || true
${git_bin} clone -b ${bbdtbs} https://github.com/beagleboard/BeagleBoard-DeviceTrees --depth=1
+ cd ./BeagleBoard-DeviceTrees
+ bbdtbs_hash=$(git rev-parse HEAD)
+ cd -
fi
cd ./KERNEL/
@@ -357,8 +392,9 @@ beagleboard_dtbs () {
${git_bin} add -f arch/arm/boot/dts/
${git_bin} add -f include/dt-bindings/
- ${git_bin} commit -a -m "Add BeagleBoard.org DTBS: $bbdtbs" -m "https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/${bbdtbs}" -s
+ ${git_bin} commit -a -m "Add BeagleBoard.org DTBS: $bbdtbs" -m "https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/${bbdtbs}" -m "https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/${bbdtbs_hash}" -s
${git_bin} format-patch -1 -o ../patches/soc/ti/beagleboard_dtbs/
+ echo "BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/${bbdtbs_hash}" > ../patches/git/BBDTBS
rm -rf ../BeagleBoard-DeviceTrees/ || true
@@ -411,7 +447,7 @@ post_backports () {
fi
${git_bin} add .
- ${git_bin} commit -a -m "backports: ${subsystem}: from: linux.git" -s
+ ${git_bin} commit -a -m "backports: ${subsystem}: from: linux.git" -m "Reference: ${backport_tag}" -s
if [ ! -d ../patches/backports/${subsystem}/ ] ; then
mkdir -p ../patches/backports/${subsystem}/
fi
@@ -497,7 +533,6 @@ packaging () {
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
cp -v "${DIR}/3rdparty/packaging/builddeb" "${DIR}/KERNEL/scripts/package"
- cp -v "${DIR}/3rdparty/packaging/mkdebian" "${DIR}/KERNEL/scripts/package"
${git_bin} commit -a -m 'packaging: sync builddeb changes' -s
${git_bin} format-patch -1 -o "${DIR}/patches/packaging"
exit 2
diff --git a/repo_maintenance/push-bb.org.sh b/repo_maintenance/push-bb.org.sh
index 49649f34833f22b20a81237267846a6df4076c22..8380fc71abcc4e9a179fbbcadeec8286fa02d51a 100755
--- a/repo_maintenance/push-bb.org.sh
+++ b/repo_maintenance/push-bb.org.sh
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
-# Copyright (c) 2009-2017 Robert Nelson <robertcnelson@gmail.com>
+# Copyright (c) 2009-2019 Robert Nelson <robertcnelson@gmail.com>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,34 @@
#yeah, i'm getting lazy..
+wfile="/tmp/5_4_bone_git_msg"
+
+cat_files () {
+ if [ -f ../patches/git/AUFS ] ; then
+ cat ../patches/git/AUFS >> ${wfile}
+ fi
+
+ if [ -f ../patches/git/BBDTBS ] ; then
+ cat ../patches/git/BBDTBS >> ${wfile}
+ fi
+
+ if [ -f ../patches/git/CAN-ISOTP ] ; then
+ cat ../patches/git/CAN-ISOTP >> ${wfile}
+ fi
+
+ if [ -f ../patches/git/RT ] ; then
+ cat ../patches/git/RT >> ${wfile}
+ fi
+
+ if [ -f ../patches/git/TI_AMX3_CM3 ] ; then
+ cat ../patches/git/TI_AMX3_CM3 >> ${wfile}
+ fi
+
+ if [ -f ../patches/git/WIREGUARD ] ; then
+ cat ../patches/git/WIREGUARD >> ${wfile}
+ fi
+}
+
DIR=$PWD
git_bin=$(which git)
@@ -42,12 +70,18 @@ if [ -e ${DIR}/version.sh ]; then
${git_bin} add arch/${KERNEL_ARCH}/configs/${example}_defconfig
if [ "x${ti_git_old_release}" = "x${ti_git_post}" ] ; then
- ${git_bin} commit -a -m "${KERNEL_TAG}${BUILD} ${example}_defconfig" -s
+ echo "${KERNEL_TAG}${BUILD}" > ${wfile}
+ echo "${KERNEL_TAG}${BUILD} ${example}_defconfig" >> ${wfile}
+ cat_files
else
- ${git_bin} commit -a -m "${KERNEL_TAG}${BUILD} ${example}_defconfig" -m "${KERNEL_REL} TI Delta: ${compare}/${ti_git_old_release}...${ti_git_post}" -s
+ echo "${KERNEL_TAG}${BUILD}" > ${wfile}
+ echo "${KERNEL_TAG}${BUILD} ${example}_defconfig" >> ${wfile}
+ echo "${KERNEL_REL} TI Delta: ${compare}/${ti_git_old_release}...${ti_git_post}" >> ${wfile}
+ cat_files
fi
+ ${git_bin} commit -a -F ${wfile} -s
- ${git_bin} tag -a "${KERNEL_TAG}${BUILD}" -m "${KERNEL_TAG}${BUILD}" -f
+ ${git_bin} tag -a "${KERNEL_TAG}${BUILD}" -F ${wfile} -f
#push tag
${git_bin} push -f ${repo} "${KERNEL_TAG}${BUILD}"
diff --git a/repo_maintenance/push-kernel-n-test.sh b/repo_maintenance/push-kernel-n-test.sh
index 9d14a21257ce9c2d252c113fe1e1fb61477220e7..b22d8ed4c9adf2d36da029c0a034087718abe5a0 100755
--- a/repo_maintenance/push-kernel-n-test.sh
+++ b/repo_maintenance/push-kernel-n-test.sh
@@ -1,5 +1,35 @@
#!/bin/sh -e
+#yeah, i'm getting lazy..
+
+wfile="/tmp/5_4_bone_git_msg"
+
+cat_files () {
+ if [ -f ./patches/git/AUFS ] ; then
+ cat ./patches/git/AUFS >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/BBDTBS ] ; then
+ cat ./patches/git/BBDTBS >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/CAN-ISOTP ] ; then
+ cat ./patches/git/CAN-ISOTP >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/RT ] ; then
+ cat ./patches/git/RT >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/TI_AMX3_CM3 ] ; then
+ cat ./patches/git/TI_AMX3_CM3 >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/WIREGUARD ] ; then
+ cat ./patches/git/WIREGUARD >> ${wfile}
+ fi
+}
+
DIR=$PWD
git_bin=$(which git)
@@ -17,7 +47,10 @@ if [ -e ${DIR}/version.sh ]; then
exit
fi
- ${git_bin} commit -a -m "kernel v${KERNEL_TAG} rebase with rt: v${KERNEL_REL}${kernel_rt} aufs/wireguard/etc" -s
+ echo "kernel v${KERNEL_TAG} rebase with rt: v${KERNEL_REL}${kernel_rt} aufs/wireguard/etc" > ${wfile}
+ cat_files
+
+ ${git_bin} commit -a -F ${wfile} -s
echo "log: git push origin ${BRANCH}"
${git_bin} push origin ${BRANCH}
fi
diff --git a/repo_maintenance/push-n-tag-release.sh b/repo_maintenance/push-n-tag-release.sh
index de5762cb7ff24d15b904474377fd3e8bdac24576..30f77ef15446e54ffa60d1ffa7eda07e15e778d3 100755
--- a/repo_maintenance/push-n-tag-release.sh
+++ b/repo_maintenance/push-n-tag-release.sh
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
-# Copyright (c) 2009-2017 Robert Nelson <robertcnelson@gmail.com>
+# Copyright (c) 2009-2019 Robert Nelson <robertcnelson@gmail.com>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,34 @@
#yeah, i'm getting lazy..
+wfile="/tmp/5_4_bone_git_msg"
+
+cat_files () {
+ if [ -f ./patches/git/AUFS ] ; then
+ cat ./patches/git/AUFS >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/BBDTBS ] ; then
+ cat ./patches/git/BBDTBS >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/CAN-ISOTP ] ; then
+ cat ./patches/git/CAN-ISOTP >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/RT ] ; then
+ cat ./patches/git/RT >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/TI_AMX3_CM3 ] ; then
+ cat ./patches/git/TI_AMX3_CM3 >> ${wfile}
+ fi
+
+ if [ -f ./patches/git/WIREGUARD ] ; then
+ cat ./patches/git/WIREGUARD >> ${wfile}
+ fi
+}
+
DIR=$PWD
git_bin=$(which git)
@@ -32,7 +60,10 @@ if [ -e ${DIR}/version.sh ]; then
unset BRANCH
. ${DIR}/version.sh
- ${git_bin} commit -a -m "${KERNEL_TAG}${BUILD} release" -s
+ echo "${KERNEL_TAG}${BUILD} release" > ${wfile}
+ cat_files
+
+ ${git_bin} commit -a -F ${wfile} -s
${git_bin} tag -a "${KERNEL_TAG}${BUILD}" -m "${KERNEL_TAG}${BUILD}" -f
${git_bin} push -f origin ${BRANCH}
@@ -46,7 +77,10 @@ if [ -e ${DIR}/version.sh ]; then
cp ${DIR}/KERNEL/defconfig ${DIR}/KERNEL/arch/${KERNEL_ARCH}/configs/${example}_defconfig
${git_bin} add arch/${KERNEL_ARCH}/configs/${example}_defconfig
- ${git_bin} commit -a -m "${KERNEL_TAG}${BUILD} ${example}_defconfig" -s
+ echo "${KERNEL_TAG}${BUILD} ${example}_defconfig" > ${wfile}
+ cat_files
+
+ ${git_bin} commit -a -F ${wfile} -s
${git_bin} tag -a "${KERNEL_TAG}${BUILD}" -m "${KERNEL_TAG}${BUILD}" -f
#push tag
diff --git a/repo_maintenance/push-sync-with-master.sh b/repo_maintenance/push-sync-with-master.sh
index c5ea615ab4ea73f8cef1b8808d0bdd18454a0e1d..24d9f97c4c9bf88af20ce8d6983cc6826b49013a 100755
--- a/repo_maintenance/push-sync-with-master.sh
+++ b/repo_maintenance/push-sync-with-master.sh
@@ -11,7 +11,7 @@ if [ -e ${DIR}/version.sh ]; then
BRANCH="master"
fi
- ${git_bin} commit -a -m "scripts: sync with master of: https://github.com/RobertCNelson/stable-kernel.git" -s
+ ${git_bin} commit -a -m "scripts: resync all build scripts with master repo: https://github.com/RobertCNelson/linux-dev" -s
${git_bin} push origin ${BRANCH}
fi