Skip to content

Rename packages-folder#766

Merged
SvenRoederer merged 3 commits intomasterfrom
rename_packages
Apr 14, 2020
Merged

Rename packages-folder#766
SvenRoederer merged 3 commits intomasterfrom
rename_packages

Conversation

@SvenRoederer
Copy link
Copy Markdown
Contributor

@SvenRoederer SvenRoederer commented Mar 7, 2020

Rename the folder "packages" to "packagelists". This change will

@SvenRoederer SvenRoederer mentioned this pull request Mar 7, 2020
Draft
@akira25
Copy link
Copy Markdown
Member

akira25 commented Mar 8, 2020

Ah. That went quick. ^^
Is it appropriate to rename that folder now? I think we should postpone that rename until your suggestion for restructuring the build system is RFC. If done then, we should maybe rebase it into one commit.

@pmelange @booo What do you think?

@SvenRoederer
Copy link
Copy Markdown
Contributor Author

SvenRoederer commented Mar 9, 2020

the commits have been around in this branch for some time, but I did not make a PR out of them before :-)
Probably it's handy, to keep the .gitignore change separate, but squashing is fine.

Why postponing? Currently there ist the problem, that "git status" complains on untracked files in "packages" as soon as "make prepare" was called.

SvenRoederer added a commit that referenced this pull request Mar 10, 2020
@SvenRoederer
Merge branch rename_packages (PR #766)
f6970d2
@akira25
Copy link
Copy Markdown
Member

akira25 commented Mar 20, 2020

The build of this branch was successful on my machine, but i didn't test the images.

@SvenRoederer
Copy link
Copy Markdown
Contributor Author

SvenRoederer commented Mar 23, 2020

thanks for a separate test, quite sure the images are fine, as the imagebuilder is called with the same arguments.

I'd like to merge this soon.

SvenRoederer added a commit that referenced this pull request Apr 10, 2020
@SvenRoederer
Merge branch rename_packages (PR #766)
84d310e
akira25
akira25 approved these changes Apr 12, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@akira25 akira25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes work fine. But I'd prefer the 4 commits to be squashed into one.

@SvenRoederer
Copy link
Copy Markdown
Contributor Author

SvenRoederer commented Apr 13, 2020

let's agree on squashing the 1st and the last into one and keep the other two separate, as they don't strictly belong to the folder-renaming.

@akira25
Copy link
Copy Markdown
Member

akira25 commented Apr 13, 2020

Okay. I'm fine with that.

@SvenRoederer
rename packages folder to packagelists
063ec1b 
When we started to use some code of the gluon framework a minor conflict of the usage
of the packages-folder came up.
We use it to store the package-lists for our images, Gluon uses this folder to store
the upstream repos. By this double-use there are always the repos inside the folder
and causing git to report them as untracked files. Adding the folder to .gitignore is
also no option, as we need it for our package-lists.
So just lets move our files and adjust .gitignore.
@SvenRoederer
assemble_firmware.sh: adapt to changed location of packageslist
72942cd
@SvenRoederer
gitignore: add packages folder
aff82c1 
As it's used to store the upstream-repos which don't need tracking.
@SvenRoederer SvenRoederer merged commit acacc6a into master Apr 14, 2020
@SvenRoederer SvenRoederer deleted the rename_packages branch April 14, 2020 21:08
SvenRoederer added a commit to SvenRoederer/freifunk-berlin-firmware that referenced this pull request Apr 26, 2020
@SvenRoederer
backport merging PR freifunk-berlin#766 (Rename packages-folder)
bd89c81
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akira25 akira25 akira25 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SvenRoederer @akira25