[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     cf8ea0ccae44f50bb07348c5f474e00b56ad4255
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 00:46:41 2014 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 00:46:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=cf8ea0cc

Start porting gpdorelease to git

---
 scripts/gpdorelease | 48 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index 1bb67e0..9f8ca05 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-#updated for 3.0
+# updated for git
+# updated for 3.0
 
 function usage {
 	echo ">>> USAGE: gpdorelease <version>"
@@ -14,11 +15,15 @@ function usage {
     echo "  Example for kernel version 3.1.1:  gpdorelease 3.1"
 }
 
+echo "This is still under testing."
+exit -1
+
 if [[ ${#@} == 0 ]] ; then
     usage
     exit -1
 fi
 
+
 if [[ ${1} == "--config" ]] ; then
 	echo "Sourcing ${2} instead of ~/.genpatchesrc"
 	source ${2}
@@ -34,12 +39,12 @@ fi
 
 BRANCH="$1"
 
-if [[ $(svn status ${LOCAL_PATCHES_TRUNK} | wc -l) != "0" ]] ; then
+if [[ $(git -C ${LOCAL_PATCHES_TRUNK} status --porcelain | wc -l) != "0" ]] ; then
 	echo ">>> ERROR: There are uncommited changes in ${LOCAL_PATCHES_TRUNK}"
 	exit -1
 fi
 
-EXISTING_TAGS="$(svn ls ${REMOTE_TAGS})"
+EXISTING_TAGS="$(git -C ${LOCAL_PATCHES_TRUNK} tag -l)"
 
 lastver=0
 for i in $EXISTING_TAGS ; do
@@ -50,6 +55,7 @@ for i in $EXISTING_TAGS ; do
 	fi
 done
 
+
 if [[ -z $lastrelease ]] ; then
 	newrel="1"
 else
@@ -71,31 +77,43 @@ echo "Press enter to continue."
 
 read
 
-svn copy ${REMOTE_TRUNK}/${BRANCH} ${REMOTE_TAGS}/${newfullver} -m "${newfullver} release"
+# checkout branch
+cd ${LOCAL_PATCHES_TRUNK}
+
+git -C ${LOCAL_PATCHES_TRUNK} checkout ${BRANCH}
+
+#svn copy ${REMOTE_TRUNK}/${BRANCH} ${REMOTE_TAGS}/${newfullver} -m "${newfullver} release"
 
 file_base="/tmp/${TARBALL_BASENAME}-$newfullver.base.tar.xz"
 file_extras="/tmp/${TARBALL_BASENAME}-$newfullver.extras.tar.xz"
 file_experimental="/tmp/${TARBALL_BASENAME}-$newfullver.experimental.tar.xz"
-dir="${BRANCH}"
-cd ${LOCAL_PATCHES_TRUNK}
 
+# build tarballs
 if [[ "${WE_WANT}" == *"base"* ]] ; then
-	[ -n "$(find ${dir}/[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ${dir}/[012]*
+	[ -n "$(find ./[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ./[012]*
 fi
 
 if [[ "${WE_WANT}" == *"extras"* ]] ; then
-	[ -n "$(find ${dir}/[34]* 2>/dev/null)" ] && tar -cvJf ${file_extras} ${dir}/[34]*
+	[ -n "$(find ./[34]* 2>/dev/null)" ] && tar -cvJf ${file_extras} ./[34]*
 fi
 
 if [[ "${WE_WANT}" == *"experimental"* ]] ; then
-	[ -n "$(find ${dir}/50* 2>/dev/null)" ] && tar -cvJf ${file_experimental} ${dir}/50*
+	[ -n "$(find ./50* 2>/dev/null)" ] && tar -cvJf ${file_experimental} ./50*
 fi
 
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/space/distfiles-local
+#tag release
 
-if [[ ${DO_WEBSITE} == "yes" ]] ; then
-	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/
-	gpdoweb
-fi
+#push tag
+
+# copy files to distfiles-local
+scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
+
+#checkout master
+echo "checkout command is git -C ${LOCAL_PATCHES_TRUNK} checkout master"
+
+##if [[ ${DO_WEBSITE} == "yes" ]] ; then
+#	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/
+#	gpdoweb
+#fi
 
-[[ ${DO_EMAIL_ANNOUNCEMENT} == "yes" ]] && gpdoemail $newfullver $KERNEL_NAME
+#[[ ${DO_EMAIL_ANNOUNCEMENT} == "yes" ]] && gpdoemail $newfullver $KERNEL_NAME

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     d9147eaa58db3f3a9d1f7a5213a454cae2f1e7a5
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 12:22:30 2014 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 12:22:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=d9147eaa

Updated gpdorelease for svn to git conversion

---
 scripts/gpdorelease | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index 9f8ca05..4625190 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -15,9 +15,6 @@ function usage {
     echo "  Example for kernel version 3.1.1:  gpdorelease 3.1"
 }
 
-echo "This is still under testing."
-exit -1
-
 if [[ ${#@} == 0 ]] ; then
     usage
     exit -1
@@ -78,17 +75,18 @@ echo "Press enter to continue."
 read
 
 # checkout branch
+echo "Checking out branch ${BRANCH}"
 cd ${LOCAL_PATCHES_TRUNK}
 
 git -C ${LOCAL_PATCHES_TRUNK} checkout ${BRANCH}
 
-#svn copy ${REMOTE_TRUNK}/${BRANCH} ${REMOTE_TAGS}/${newfullver} -m "${newfullver} release"
-
 file_base="/tmp/${TARBALL_BASENAME}-$newfullver.base.tar.xz"
 file_extras="/tmp/${TARBALL_BASENAME}-$newfullver.extras.tar.xz"
 file_experimental="/tmp/${TARBALL_BASENAME}-$newfullver.experimental.tar.xz"
 
 # build tarballs
+echo "Creating tarballs in /tmp..."
+
 if [[ "${WE_WANT}" == *"base"* ]] ; then
 	[ -n "$(find ./[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ./[012]*
 fi
@@ -102,14 +100,17 @@ if [[ "${WE_WANT}" == *"experimental"* ]] ; then
 fi
 
 #tag release
+echo "Tagging with ${newfullver}"
+git -C ${LOCAL_PATCHES_TRUNK} tag ${newfullver}
 
 #push tag
+echo "Pushing tag ${newfullver}"
+git push --tags -u origin ${BRANCH}
 
 # copy files to distfiles-local
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
-
-#checkout master
-echo "checkout command is git -C ${LOCAL_PATCHES_TRUNK} checkout master"
+#scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
+echo "scp'in files to dev.gentoo.org:/space/distfiles-local"
+scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/space/distfiles-local
 
 ##if [[ ${DO_WEBSITE} == "yes" ]] ; then
 #	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     1f0cd2689dfa64e7a8c1b31954c152808046701e
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 26 23:50:47 2014 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Jun 26 23:50:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=1f0cd268

Initial fixes for git migration. Not yet complete.

---
 scripts/gpdoweb | 43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/scripts/gpdoweb b/scripts/gpdoweb
index d9a8ee6..b6a35f9 100755
--- a/scripts/gpdoweb
+++ b/scripts/gpdoweb
@@ -2,13 +2,48 @@
 
 . ~/.genpatchesrc
 
+# calling make site
 cd ${WEB_LOCAL}
-./makesite.pl
+#./makesite.pl
 
+# send generated htm files for site
 rsync --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh \
-	${WEB_LOCAL}/output/ ${USERNAME}@${WEB_GENPATCHES_BASE}
-rsync --delete -Cavze ssh ${LOCAL_PATCHES_TRUNK}/ ${USERNAME}@${WEB_GENPATCHES_BASE}/trunk
+    ${WEB_LOCAL}/output/ ${USERNAME}@${WEB_GENPATCHES_BASE}
+
+# this actually will need to copy the patches to the /trunk directory (that might need to change)
+
+# delete directory if /tmp/linux-patches exists
+
+cd ${LOCAL_TMP}
+
+if [ -d "${LOCAL_TMP}/linux-patches" ]; then
+    rm -rf "${LOCAL_TMP}/linux-patches"
+fi
+
+
+# clone linux-patches
+git clone $REMOTE_BASE ${LOCAL_TMP}/linux-patches
+
+
+# get list of branches
+
+for BRANCH in $(git -C ${LOCAL_TMP}/linux-patches for-each-ref --format='%(refname)' refs/remotes/origin/[0-9].*); do
+    BRANCH="${BRANCH//*\/}"
+
+    # checkout branch
+    cd ${LOCAL_TMP}/linux-patches
+    git -C ${LOCAL_TMP}/linux-patches checkout ${BRANCH}
+
+    # copy patches
+    rsync --delete -Cavze ssh ${LOCAL_TMP}/linux-patches/ ${USERNAME}@${WEB_GENPATCHES_BASE}/trunk/$BRANCH
+done
+
+# should be easy, copy uploaded files from dev server to tarballs directory locally
+echo "rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
 rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
-rsync -Cavze ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs
 
+# easy again, copy local tarballs to public_html
+rsync -Cavze ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs
 
+# remove linux-patches
+rm -rf ${LOCAL_TMP}/linux-patches

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     91bfb1d9bdba02555adb7b063bf5f112b559a41e
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 15 12:34:14 2014 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 12:34:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=91bfb1d9

Add porting TODO and exit to script

---
 scripts/gpcreatebranch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/gpcreatebranch b/scripts/gpcreatebranch
index 319adb3..27486c3 100755
--- a/scripts/gpcreatebranch
+++ b/scripts/gpcreatebranch
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+echo "TODO: port to git"
+exit
+
 . ~/.genpatchesrc
 if [[ ${#@} != 2 ]] ; then
 	echo ">>> USAGE: gpcreatebranch <old-version> <new-version>"

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Anthony G. Basile]

commit:     d87b1ff6119cb184872b3e736a6d9a9a1334bb7f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 00:46:47 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 00:52:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=d87b1ff6

scripts: initial commit of get-patch

---
 scripts/get-patch | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/scripts/get-patch b/scripts/get-patch
new file mode 100755
index 0000000..5d56874
--- /dev/null
+++ b/scripts/get-patch
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+GENPATCHES_URL="git://git.overlays.gentoo.org/proj/linux-patches.git"
+KERNEL_BASE_URL="https://www.kernel.org/pub/linux/kernel/v3.x"
+KERENL_INCR_URL="${KERNEL_BASE_URL}/incr"
+
+
+usage() {
+    echo "Usage: $0 n [m]."
+    echo
+    echo "When called from within a branch N of the linux-patches repo,"
+    echo "get-patch will download patch-N.n-(n+1).xz from kernel.org"
+    echo "and rename it to 100n_linux-N-(n+1).patch for inclusion in"
+    echo "the genpatches patchset."
+    echo
+    echo "If a range 'n m' is given, then that range of patches will"
+    echo "be downloaded.  get-patch expects n < m."
+    echo
+    exit $1
+}
+
+error_branch() {
+    echo "Could not detect your branch.  get-patch expects you to be"
+    echo "in a branch of $LINUX_PATCHES_URL"
+    echo
+    exit 4
+}
+
+error_download() {
+    echo "Couldn't download $1, bailing out!"
+    echo
+    rm -f $2
+    exit 5
+}
+
+warning_exists() {
+    echo "Warning, $1 alreay exists, not downloading."
+    echo "If you want to download it again, remove the current file."
+    echo
+}
+
+alert_downloaded() {
+    echo "Downloaded: $1"
+    echo
+}
+
+[[ "$1" == "-h" || "$1" == "--help" ]] && usage 0
+[[ -z "$1" ]] && usage 1
+[[ ! -z "$3" ]] && usage 2
+[[ ! -z "$2" && $1 -ge $2 ]] && usage 3
+
+version=$(git rev-parse --abbrev-ref HEAD)
+
+[[ -z "$version" ]] && error_branch
+
+[[ -z "$2" ]] && limit=$(expr $1 + 1) || limit=$2
+
+for i in $(seq $1 $(expr $limit - 1)) ; do
+    if [[ $i -eq 0 ]]; then
+        front=100
+        GET="${KERNEL_BASE_URL}/patch-${version}.1.xz"
+    else
+        if [[ $i -lt 10 ]] ; then
+            front=100
+        else
+            front=10
+        fi
+        GET="${KERENL_INCR_URL}/patch-${version}.$i-$(expr $i + 1).xz"
+    fi
+    SAVE="${front}${i}_linux-${version}.$(expr $i + 1).patch"
+    [[ -f "${SAVE}" ]] &&  warning_exists "${SAVE}" && continue
+    wget "${GET}" -O "${SAVE}.xz" >/dev/null 2>&1
+    [[ $? -ne 0 ]] && error_download "${GET}" "${SAVE}.xz" || alert_downloaded "${SAVE}"
+    xz -d "${SAVE}.xz"
+done

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Anthony G. Basile]

commit:     6e6a229ff78b62c899a4cc3c7a7a039f61f6feb5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  6 12:10:24 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct  6 12:10:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=6e6a229f

scripts/get-patch: fix typo in return code

---
 scripts/get-patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-patch b/scripts/get-patch
index 5d56874..eb7874a 100755
--- a/scripts/get-patch
+++ b/scripts/get-patch
@@ -16,7 +16,7 @@ usage() {
     echo "If a range 'n m' is given, then that range of patches will"
     echo "be downloaded.  get-patch expects n < m."
     echo
-    exit $1
+    exit 1
 }
 
 error_branch() {

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     b9a85581283052297808cd67d19a287c74bccc06
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 17:48:39 2015 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 17:48:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=b9a85581

Fix url for email notice.

 scripts/get-patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-patch b/scripts/get-patch
index eb7874a..eb5dbd8 100755
--- a/scripts/get-patch
+++ b/scripts/get-patch
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GENPATCHES_URL="git://git.overlays.gentoo.org/proj/linux-patches.git"
+GENPATCHES_URL="git://git.gentoo.org/proj/linux-patches.git"
 KERNEL_BASE_URL="https://www.kernel.org/pub/linux/kernel/v3.x"
 KERENL_INCR_URL="${KERNEL_BASE_URL}/incr"
 

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     36625fc3f265bc98a0b99ef8503b025e6bca2772
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 23:12:36 2018 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 23:12:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=36625fc3

Try to generate reproducible tarballs by excluding anything that might
be an artifact of the checkout:
- local ownership of files
- local mtime of files
- file ordering in tarball

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index bec5650..f8eb374 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -84,25 +84,44 @@ file_base="/tmp/${TARBALL_BASENAME}-$newfullver.base.tar.xz"
 file_extras="/tmp/${TARBALL_BASENAME}-$newfullver.extras.tar.xz"
 file_experimental="/tmp/${TARBALL_BASENAME}-$newfullver.experimental.tar.xz"
 
+#tag release
+echo "Tagging with ${newfullver}"
+git -C ${LOCAL_PATCHES_TRUNK} tag ${newfullver} || exit 1
+
 # build tarballs
 echo "Creating tarballs in /tmp..."
 
+# Try very hard to ensure repeated generated of tarballs on different systems
+# produces the same results.
+# - the order of files inside the tarball should be alphabetic (rather than
+#   disk or inode)
+# - the owner/group of files inside the tarball should be root/root
+# - the mtime of files inside the tarball should match the mtime of the commit
+#   at HEAD of the tag.
+# -- this might NOT be the mtime of the tag!
+_mtime=$(git -C "${LOCAL_PATCHES_TRUNK}" log -1  --format=@%ct "${newfullver}")
+TAR_CMD=(
+	tar
+	--group=root:0
+	--owner=root:0
+	--sort=name
+	--mtime="$_mtime"
+	--xz
+	-cvf
+)
+
 if [[ "${WE_WANT}" == *"base"* ]] ; then
-	[ -n "$(find ./[012]* 2>/dev/null)" ] && tar -cvJf ${file_base} ./[012]*
+	[ -n "$(find ./[012]* 2>/dev/null)" ] && "${TAR_CMD[@]}" ${file_base} ./[012]*
 fi
 
 if [[ "${WE_WANT}" == *"extras"* ]] ; then
-	[ -n "$(find ./[34]* 2>/dev/null)" ] && tar -cvJf ${file_extras} ./[34]*
+	[ -n "$(find ./[34]* 2>/dev/null)" ] && "${TAR_CMD[@]}" ${file_extras} ./[34]*
 fi
 
 if [[ "${WE_WANT}" == *"experimental"* ]] ; then
-	[ -n "$(find ./50* 2>/dev/null)" ] && tar -cvJf ${file_experimental} ./50*
+	[ -n "$(find ./50* 2>/dev/null)" ] && "${TAR_CMD[@]}" ${file_experimental} ./50*
 fi
 
-#tag release
-echo "Tagging with ${newfullver}"
-git -C ${LOCAL_PATCHES_TRUNK} tag ${newfullver}
-
 #push tag
 echo "Pushing tag ${newfullver}"
 git push --tags -u origin ${BRANCH}

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     76de3e357ae09c704e1f5b92052c4b9187dcd3e3
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 19:27:25 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 19:27:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=76de3e35

Change scp from /space/distfiles-local to ~/space/distfiles-local

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index f8eb374..6b02e3b 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -128,8 +128,8 @@ git push --tags -u origin ${BRANCH}
 
 # copy files to distfiles-local
 #scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
-echo "scp'in files to dev.gentoo.org:/space/distfiles-local"
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/space/distfiles-local
+echo "scp'in files to dev.gentoo.org:~/space/distfiles-local"
+scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/space/distfiles-local
 
 ##if [[ ${DO_WEBSITE} == "yes" ]] ; then
 #	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     bbb1560e6f333fdee12a205c5b386ffcc0526264
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 22:12:05 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 22:12:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=bbb1560e

fix distfiles directory

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index 6b02e3b..d705387 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -128,8 +128,8 @@ git push --tags -u origin ${BRANCH}
 
 # copy files to distfiles-local
 #scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
-echo "scp'in files to dev.gentoo.org:~/space/distfiles-local"
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/space/distfiles-local
+echo "scp'in files to dev.gentoo.org:~/public_html/distfiles"
+scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/distfiles
 
 ##if [[ ${DO_WEBSITE} == "yes" ]] ; then
 #	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     275892c4e6014de710fb023001d9d0b95056d548
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 19:11:30 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 19:11:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=275892c4

Update genpatches upload location

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index d705387..bc0d9a1 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -128,8 +128,8 @@ git push --tags -u origin ${BRANCH}
 
 # copy files to distfiles-local
 #scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
-echo "scp'in files to dev.gentoo.org:~/public_html/distfiles"
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/distfiles
+echo "scp'in files to dev.gentoo.org:~/public_html/dist/genpatches"
+scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches
 
 ##if [[ ${DO_WEBSITE} == "yes" ]] ; then
 #	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     a1276f7f2c41720aeee601e59069f45f1fb5ebf2
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 18:02:22 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 18:02:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=a1276f7f

More distfiles-local to ~devspace changes

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease | 2 +-
 scripts/gpdoweb     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index bc0d9a1..7fe0698 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -65,7 +65,7 @@ newfullver="${BRANCH}-${newrel}"
 echo "I will now:"
 echo "1. Tag the ${BRANCH} branch as ${newfullver} (immediate commit)"
 echo "2. Produce genpatches-${newfullver} tarballs"
-echo "3. Upload tarballs to distfiles-local"
+echo "3. Upload tarballs to ~<dev nick>/public_html/dist/genpatches"
 echo "4. (Optionally) create and upload website"
 echo "5. (Optionally) send a release announcement to gentoo-kernel"
 echo

diff --git a/scripts/gpdoweb b/scripts/gpdoweb
index 5f7ec9f..f4959ca 100755
--- a/scripts/gpdoweb
+++ b/scripts/gpdoweb
@@ -39,8 +39,10 @@ for BRANCH in $(git -C ${LOCAL_TMP}/linux-patches for-each-ref --format='%(refna
 done
 
 # should be easy, copy uploaded files from dev server to tarballs directory locally
-echo "rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
-rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
+#echo "rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
+#rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
+echo "rsync -avz ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
+rsync -avz ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
 
 # easy again, copy local tarballs to public_html
 rsync -Cavze ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     798f1a11ab87b7ce323478effbf4ed70410f4ec5
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 15:50:08 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 15:50:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=798f1a11

Script to get wireguard patch. Thanks to zx2c4.

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpwireguard | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/gpwireguard b/scripts/gpwireguard
new file mode 100755
index 0000000..1df97af
--- /dev/null
+++ b/scripts/gpwireguard
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+dst="$(readlink -f "wireguard-backport-5.4.y.patch")"
+temp="$(mktemp -d)"
+trap 'cd /; rm -rf "$temp";' INT TERM EXIT
+cd "$temp"
+echo "[+] Fetching patch for 5.4.y"
+curl -# -f -L -o git-patches.mbox "https://git.zx2c4.com/wireguard-linux/patch/?id2=gregkh/stable-5.4.y&id=backport-5.4.y"
+echo "[+] Normalizing patch"
+splitdiff -a -p 1 git-patches.mbox
+l=/dev/null
+for patch in *.patch; do
+	combinediff -q -p 1 "$l" "$patch" > next.patch
+	l=last.patch
+	mv next.patch last.patch
+done
+mv last.patch "$dst"
+echo "[+] Result is in $dst"

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     6737f745a471029a0abca264fc476a73fdc4219b
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  8 11:51:58 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 11:51:58 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=6737f745

Change scp to rsync

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index 7fe0698..f57be91 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -128,8 +128,8 @@ git push --tags -u origin ${BRANCH}
 
 # copy files to distfiles-local
 #scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
-echo "scp'in files to dev.gentoo.org:~/public_html/dist/genpatches"
-scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches
+echo "rsycn'in files to dev.gentoo.org:~/public_html/dist/genpatches"
+rsync /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches
 
 ##if [[ ${DO_WEBSITE} == "yes" ]] ; then
 #	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     ee193ee9d95da3127d22e7a475e1c8f487e54966
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 14:53:39 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 14:53:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ee193ee9

Add --progress to rsync command

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdorelease |  2 +-
 scripts/gpdoweb     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/gpdorelease b/scripts/gpdorelease
index f57be91..5936489 100755
--- a/scripts/gpdorelease
+++ b/scripts/gpdorelease
@@ -129,7 +129,7 @@ git push --tags -u origin ${BRANCH}
 # copy files to distfiles-local
 #scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp
 echo "rsycn'in files to dev.gentoo.org:~/public_html/dist/genpatches"
-rsync /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches
+rsync -P /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches
 
 ##if [[ ${DO_WEBSITE} == "yes" ]] ; then
 #	mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/

diff --git a/scripts/gpdoweb b/scripts/gpdoweb
index feb2240..4b06e5b 100755
--- a/scripts/gpdoweb
+++ b/scripts/gpdoweb
@@ -11,7 +11,7 @@ fi
 
 # send generated htm files for site
 echo "calling rsync command: rsync --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh ${WEB_LOCAL}/output/ ${USERNAME}@${WEB_GENPATCHES_BASE}"
-rsync --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh \
+rsync -P --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh \
     ${WEB_LOCAL}/output/ ${USERNAME}@${WEB_GENPATCHES_BASE}
 
 # delete directory if /tmp/linux-patches exists
@@ -38,17 +38,17 @@ for BRANCH in $(git -C ${LOCAL_TMP}/linux-patches for-each-ref --format='%(refna
     git -C ${LOCAL_TMP}/linux-patches checkout ${BRANCH}
 
     # copy patches
-    rsync --delete -Cavze ssh ${LOCAL_TMP}/linux-patches/ ${USERNAME}@${WEB_GENPATCHES_BASE}/trunk/$BRANCH
+    rsync -P --delete -Cavze ssh ${LOCAL_TMP}/linux-patches/ ${USERNAME}@${WEB_GENPATCHES_BASE}/trunk/$BRANCH
 done
 
 # should be easy, copy uploaded files from dev server to tarballs directory locally
 #echo "rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
 #rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
-echo "rsync -avz ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
-rsync -avz ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
+echo "rsync -avzP ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
+rsync -avzP ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
 
 # easy again, copy local tarballs to public_html
-rsync -Cavze ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs
+rsync -CavzeP ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs
 
 # remove linux-patches
 rm -rf ${LOCAL_TMP}/linux-patches

[gentoo-commits] proj/linux-patches:genpatches-misc commit in: scripts/

[Mike Pagano]

commit:     64857bbb9ab4fd1ed4b983ca612344f59642fe32
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 17:17:52 2022 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 17:17:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=64857bbb

Let's not confuse users by directing them to two different
websites when we only want and need one.

If and when we get an infra kernel project space to build the
genpatches website, then we should change this.

Thank-you for your understanding.

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 scripts/gpdoemail | 2 +-
 scripts/gpdoweb   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/gpdoemail b/scripts/gpdoemail
index 1b89c601..42f67c42 100755
--- a/scripts/gpdoemail
+++ b/scripts/gpdoemail
@@ -12,7 +12,7 @@ email="${ECHANGELOG_USER#*<}"
 email="${email%>}"
 
 cd ${WEB_LOCAL}
-perl email-announcement.pl $1 ${KERNEL_NAME} ${LOCAL_TMP} ${REMOTE_BASE} ${name} |
+perl email-announcement.pl $1 ${KERNEL_NAME} ${LOCAL_TMP} ${REMOTE_BASE} |
 	${SENDMAIL} -F \"${name}\" -f \"${email}\" gentoo-kernel@lists.gentoo.org
 
 

diff --git a/scripts/gpdoweb b/scripts/gpdoweb
index 4b06e5bd..2f734fd9 100755
--- a/scripts/gpdoweb
+++ b/scripts/gpdoweb
@@ -44,11 +44,11 @@ done
 # should be easy, copy uploaded files from dev server to tarballs directory locally
 #echo "rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
 #rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
-echo "rsync -avzP ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
-rsync -avzP ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
+echo "rsync -avz -P ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/"
+rsync -avz -P ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/
 
 # easy again, copy local tarballs to public_html
-rsync -CavzeP ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs
+rsync -Cavze -P ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs
 
 # remove linux-patches
 rm -rf ${LOCAL_TMP}/linux-patches