[lmi-commits] [lmi] master a4a993df: Merge 'blessed' proprietary repositories

[Greg Chicares]

branch: master
commit a4a993dfe44c4bd4d815045af4923ef78a9b8fb9
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Merge 'blessed' proprietary repositories
    
    See:
      https://lists.nongnu.org/archive/html/lmi/2022-03/msg00000.html
    
    The
      # Update local blessed repository from specially-mounted host dir
    step has been expunged deliberately; so has a long paragraph in script
    'gwc/redhat_rebuild.sh'.
---
 gwc/develop2.txt      | 12 ++++--------
 gwc/redhat_rebuild.sh | 12 ++----------
 lmi_setup_30.sh       |  7 ++++---
 lmi_setup_43.sh       | 11 ++++++-----
 tabs/6/startup_script |  2 +-
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/gwc/develop2.txt b/gwc/develop2.txt
index 394a37b4..33b2f52e 100644
--- a/gwc/develop2.txt
+++ b/gwc/develop2.txt
@@ -4,10 +4,11 @@
   #   https://lists.nongnu.org/archive/html/lmi/2016-03/msg00031.html
 
   # Initial setup: create a working copy, cloned from the
-  # already-provided "blessed" repo...
+  # already-provided "blessed" repo (only if necessary--this
+  # should already have been done automatically in any chroot) ...
 
 cd /opt/lmi
-git clone file:///opt/lmi/blessed/proprietary
+git clone file:///srv/cache_for_lmi/blessed/proprietary
 
   # ...then make sure it's set up as intended:
 
@@ -34,7 +35,7 @@ git commit --all -m"Another set of changes"
 cd /opt/lmi/proprietary
 git bundle create YourBundleName origin/master..HEAD
   # for example (substitute your own initials)
-git bundle create /opt/lmi/blessed/$(date -u +'%Y%m%dT%H%MZ')-gwc.bundle 
origin/master..HEAD
+git bundle create /srv/cache_for_lmi/blessed/$(date -u 
+'%Y%m%dT%H%MZ')-gwc.bundle origin/master..HEAD
 
   # Email that bundle, then push the changes to your "blessed" repository
 
@@ -70,11 +71,6 @@ git bundle create /srv/cache_for_lmi/blessed/$(date -u 
+'%Y%m%dT%H%MZ')-catchup.
 
 cp -ia src/* /opt/lmi/src/products/src
 
-  # Update local blessed repository from specially-mounted host dir
-
-cd /opt/lmi/blessed/proprietary
-git fetch /srv/cache_for_lmi/blessed/proprietary master:master
-
   # Whenever a rate table changes, regenerate the binary database
 
 cd /opt/lmi/data
diff --git a/gwc/redhat_rebuild.sh b/gwc/redhat_rebuild.sh
index 80e9a8f7..6d5d1b98 100755
--- a/gwc/redhat_rebuild.sh
+++ b/gwc/redhat_rebuild.sh
@@ -3,16 +3,8 @@
 set -evx
 
 # Before running this script, ensure that the proprietary repository
-# maintained outside any chroot is up to date. For example, if:
-#  - chroot 'lmi_bullseye_3' has a current proprietary repository;
-#  - '/srv/cache_for_lmi/blessed/proprietary' is out of date; and
-#  - a new chroot is to be created;
-# then run these commands:
-#   pushd /srv/cache_for_lmi/blessed/proprietary
-#   git fetch /srv/chroot/lmi_bullseye_3/opt/lmi/blessed/proprietary 
master:master
-# If, in the current chroot ('lmi_bullseye_3' in the example above),
-# the "blessed" repository is significantly behind the current working
-# copy, then first of all log into that chroot and do 'git push'.
+# maintained outside any chroot is up to date--i.e., that all changes
+# committed in any earlier chroot have been pushed.
 
             echo 'check_certificate = off' >> ~/.wgetrc
 sudo sh -c "echo 'check_certificate = off' >> ~/.wgetrc"
diff --git a/lmi_setup_30.sh b/lmi_setup_30.sh
index a44f331a..6167b78e 100755
--- a/lmi_setup_30.sh
+++ b/lmi_setup_30.sh
@@ -49,12 +49,13 @@ assert_not_chrooted
 # conserves bandwidth. Directory /srv/cache_for_lmi/ in a native msw
 # installation also contains cygwin files, which are not wanted in a
 # chroot. For convenience, add a bare repository of proprietary files
-# to this directory (after making sure it's up to date), e.g.:
+# (after making sure it's up to date) to this directory, e.g.:
 #   rm -rf /srv/cache_for_lmi/blessed/proprietary
 #   cp --dereference --preserve --recursive \
-#     /srv/chroot/some-prior-chroot/opt/lmi/blessed/ /srv/cache_for_lmi
+#     /srv/chroot/some-prior-chroot/WHENCEVER/blessed/ /srv/cache_for_lmi
 # to update the host; then those files will be accessible in chroots
-# created by these scripts (which mount that directory).
+# created by these scripts (which identity-mount that directory),
+# and 'git push' will update that bare repository in all chroots.
 
 # Also copy any desired msw software into the chroot now, e.g.:
 #   cp -a /srv/chroot/some-prior-chroot/opt/xyzzy 
/srv/chroot/"${CHRTNAME}"/opt/xyzzy
diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index a55cbfa2..ea223fd7 100755
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -41,11 +41,12 @@ if [ "greg" = "$(whoami)" ]; then
   git remote set-url --push origin chicares@git.sv.gnu.org:/srv/git/lmi.git
 fi
 
-# Duplicate proprietary repository (if available).
-# First, copy "blessed" repository (here, 'cp' is sufficient: this
-# bare repository has no references that need to be resolved):
 cd /opt/lmi || { printf 'failed: cd\n'; exit 3; }
-cp --dereference --preserve --recursive /srv/cache_for_lmi/blessed .
+# Duplicate proprietary repository (if available) from another
+# machine to the host's /srv/cache_for_lmi/ , which has been
+# identity-mounted in the chroot. Here, 'cp' is sufficient (this
+# bare repository has no references that need to be resolved):
+# cp --dereference --preserve --recursive WHENCEVER/blessed 
/srv/cache_for_lmi/blessed
 #
 # Fix ownership and permissions of bare repository, just in case.
 chgrp -R "$NORMAL_GROUP" blessed
@@ -62,7 +63,7 @@ chmod -R g=u blessed
 #
 # Apparently '--config core.SharedRepository=group' would have little
 # or no benefit here.
-git clone -b master file:///opt/lmi/blessed/proprietary
+git clone -b master file:///srv/cache_for_lmi/blessed/proprietary
 #
 # Fix ownership and permissions of working copy.
 chgrp -R "$NORMAL_GROUP" proprietary
diff --git a/tabs/6/startup_script b/tabs/6/startup_script
index 73ec6319..27b69cd5 100755
--- a/tabs/6/startup_script
+++ b/tabs/6/startup_script
@@ -5,7 +5,7 @@ a='schroot --chroot=lmi'
 b='cd /opt/lmi/proprietary'
 c='. /opt/lmi/src/lmi/set_toolchain.sh'
 d='pushd /opt/lmi/touchstone ; d=/opt/lmi/touchstone-old/touchstone-$(date -u 
+"%Y%m%dT%H%MZ") && mkdir -p $d && for z in *; do cmp --quiet $z ../test/$z || 
( mv $z $d/$z; mv ../test/$z ./$z; ) ; done; popd'
-e='git bundle create /opt/lmi/blessed/$(date -u +"%Y%m%dT%H%MZ")-gwc.bundle 
origin/master..HEAD --branches'
+e='git bundle create /srv/cache_for_lmi/blessed/$(date -u 
+"%Y%m%dT%H%MZ")-gwc.bundle origin/master..HEAD --branches'
 
 print -rs $b ; echo $b ; eval $b
 print -rs $c ; echo $c