cellular-infrastructure
/
osmocom-analog
9
1
Fork 2
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

use git-submodule for libraries #2

Open
laforge wants to merge 4 commits from laforge/osmocom-analog:laforge/submodule into master
pull from: laforge/osmocom-analog:laforge/submodule
merge into: cellular-infrastructure:master
Conversation 0 Commits 4 Files Changed 272 +929 -55188
laforge commented 2022-05-01 12:27:03 +00:00
Owner
Copy Link

Instead of copying all the library code, import it as a submodule from the new osmocom-analog-libraries.git

Instead of copying all the library code, import it as a submodule from the new osmocom-analog-libraries.git
👍 1
jolly was assigned by laforge 2022-05-01 12:27:03 +00:00
laforge added 4 commits 2022-05-01 12:27:03 +00:00
9ed1f48b5d re-structure directory tree in preparation of submodules 
This moves src/lib* to src/lib/lib* so that we can move src/lib
into a submodule in a subsequent commit
5c474118b1 remove src/lib from this repository, prepare for submodule 
The contents of src/lib will be replaced with a submodule
in a following commmit
917662e867 introduce git submodule for src/lib 
This means that clones now have to use 'git clone --recursive'
or existing clones have to manually do 'git submodule init && git
submodule update'.

The advantage is that the new library submodule can be used from other
projects like osmo-cc-* without code duplication.
laforge requested review from jolly 2022-05-01 12:27:35 +00:00
laforge added a new dependency 2022-05-01 12:27:55 +00:00
#1 src/test/Makefile.am: Fix some typos of sources .x -> .c
This pull request has changes conflicting with the target branch.
  • configure.ac
  • extra/Makefile.am
  • extra/main.c
  • src/Makefile.am
  • src/amps/Makefile.am
  • src/amps/amps.c
  • src/amps/amps.h
  • src/amps/amps_tacs_main.c
  • src/amps/dsp.c
  • src/amps/frame.c
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b laforge-laforge/submodule master
git pull laforge/submodule

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff laforge-laforge/submodule
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
jolly
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
jolly
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Depends on
#1 src/test/Makefile.am: Fix some typos of sources .x -> .c
cellular-infrastructure/osmocom-analog
Reference: cellular-infrastructure/osmocom-analog#2
No description provided.
Delete Branch "laforge/osmocom-analog:laforge/submodule"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?