On Wednesday, January 26, 2022 5:22:10 PM EST Steffen Möller wrote: > Seems like you have done something to your git repository and it cannot > just go and fetch the newer version. It could be that these are just > some changes that have been made during the build (don't think so, > should not happen) but ... you can investigate this later. "git > status" would tell what is modified. git status returns: ======================= pi@rpi4:/media/pi/workspace/linuxcnc-dev $ git status On branch master-gtk3 Your branch is up to date with 'origin/master-gtk3'.
nothing to commit, working tree clean ======================= > I personally like "git config > pull.rebase true" which puts local changes in the perspective of the > latest release. And returns nothing here. > To get the build done, I suggest to prepend to your script something > alike > > if [ -d linuxcnc-dev ]; then > d=$(date -R) > echo "I: Removing previous repository of linuxcnc-dev to > 'linuxcnc-dev-$d'" > mv linuxcnc-dev "linuxcnc-dev-$d" > fi > mkdir linuxcnc-dev > > so everything is clean - you do not run that script too often, I > presume. As often as its run. that would fill that 240gig drive in about a year. :) > Best, > Steffen > cron runs this script 4x a day: ======================= #!/bin/bash cd /media/pi/workspace/linuxcnc-dev git checkout master git pull git checkout master-gtk3 git pull ======================= To keep me uptodate. And make-all.sh gets run 4 or so times a week. That does this pull, builds it. makes debs out of the build and installs it, all in one swell foop that takes about 65 minutes to run on that pi. > On 26.01.22 22:57, gene heskett wrote: > > On Wednesday, January 26, 2022 3:49:58 PM EST Steffen Möller wrote: > >> Hi Gene, > > > > My script does a git pull first thing, which advises this: > > =========================== > > > > pi@rpi4:/media/pi/workspace $ time ./maketoruntests.sh > > > > Updating files: 100% (1854/1854), done. > > Switched to branch 'master' > > Your branch is up to date with 'origin/master'. > > hint: Pulling without specifying how to reconcile divergent branches > > is hint: discouraged. You can squelch this message by running one of > > the following > > hint: commands sometime before your next pull: > > hint: > > hint: git config pull.rebase false # merge (the default strategy) > > hint: git config pull.rebase true # rebase > > hint: git config pull.ff only # fast-forward only > > hint: > > hint: You can replace "git config" with "git config --global" to set > > a > > default > > hint: preference for all repositories. You can also pass --rebase, > > --no- rebase, > > hint: or --ff-only on the command line to override the configured > > default per > > hint: invocation. > > ======================= > > Which do you suggest I edit into this script: > > ====================== > > cd /media/pi/workspace/linuxcnc-dev/ > > git checkout master > > git pull > > git checkout master-gtk3 > > git pull > > cd ./src > > ./autogen.sh > > ./configure --with-realtime=uspace --enable-build-documentation > > sudo make clean > > make -j4 > > sudo make setuid > > source ../scripts/rip-environment > > cd .. > > cd ./src > > runtests > > > > ====================== > > I probably don't have exactly the right git stuff, not sure I > > understand it all, but its been working ok for about a year now, > > building good linuxcnc deb's on buster. > > > >> On 26.01.22 02:27, gene heskett wrote: > >>> Greetings all; > >>> > >>> I built a fresh pull of master earlier today, which makes > >>> installable > >>> debs. I normally run this shell script to install them, and on > >>> buster > >>> it Just Works. > >> > >> And that is how things should also behave on Bullseye. Let's find > >> out > >> what is going wrong. > >> > >>> But, now I have succeeded in getting a raspios bullseye to run on a > >>> 5.16.2-rt19-rt19-v7l+ #3 SMP PREEMPT_RT kernel, and that first boot > >>> updated about 2gigs of stuff. There is about 130 pkgs to update. > >> > >> I have not run bullseye on a Raspberry, yet. I would however indeed > >> go > >> and update everything. > >> > >> sudo apt-get -u dist-upgrade > >> > >> should get you there. > >> > >>> And I've found a solution to the no net on boot problem applicable > >>> to > >>> home networks that are hosts file based. If you while the card is > >>> still mounted in a reader, edit the /etc/dhcpdcp.conf file, you > >>> will > >>> find a place at the bottom that is commented out but you can > >>> uncomment it and fill in the data to fit your setup, and when > >>> booted > >>> in the pi, just works, you have a network from the gitgo. Thats one > >>> MAJOR headache out of the way. > >>> > >>> BUT, what I built on buster, will not install on bullseye as too > >>> much > >>> has been version advanced. > >> > >> That is expected. > >> > >>> I have installed about a gig of stuff dpkg > >>> complains about but have not been able to get a working install. > >>> yet... > >>> > >>> The remaining errors are: > >>> > >>> dpkg: dependency problems prevent configuration of linuxcnc-uspace: > >>> linuxcnc-uspace depends on libboost-python1.67.0; however: > >>> Package libboost-python1.67.0 is not installed. > >>> > >>> linuxcnc-uspace depends on libpython3.7 (>= 3.7.0); however: > >>> Package libpython3.7 is not installed. > >>> > >>> linuxcnc-uspace depends on python3 (<< 3.8); however: > >>> Version of python3 on system is 3.9.2-3. > >>> > >>> linuxcnc-uspace depends on python3.7-tk; however: > >>> Package python3.7-tk is not installed. > >>> > >>> linuxcnc-uspace depends on python3.7-numpy | python-numpy; however: > >>> Package python3.7-numpy is not installed. > >>> Package python-numpy is not installed. > >> > >> This raised some eyebrows on my end. Python 3.7 is history and > >> dependencies are on Python3. A grep in the debian directory of what > >> I > >> have checked out from master does not have any notion of "3.7" in > >> the > >> debian folder. And python-numpy (without the "3") is a Python2 > >> version, which is no longer needed. > >> > >>> But newer versions of all the above are all installed. > >>> I do not know at this stage if I have enough to rebuild them as > >>> yet. > >>> The debhelper suite is not yet installed. > >>> > >>> So I need to see the /e/a/sources.list.d/linuxcnc.list file for > >>> bullseye so I can see if those .debs will install. > >> > >> Something is off with your package. Please have a second look at > >> when > >> this package was built. Maybe it is an old one that was carried over > >> from your past with Buster? > >> > >> Would you be prepared to try again? From scratch starting with a > >> checkout of the master branch? > >> > >> Best, > >> Steffen > >> > >> > >> > >> > >> > >> _______________________________________________ > >> Emc-developers mailing list > >> Emc-developers@lists.sourceforge.net > >> https://lists.sourceforge.net/lists/listinfo/emc-developers > >> . > > > > Cheers, Gene Heskett. > > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers Cheers, Gene Heskett. -- "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author, 1940) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis Genes Web page <http://geneslinuxbox.net:6309/gene> _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
