Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename packages-folder #766

Merged
merged 3 commits into from
Apr 14, 2020
Merged

Rename packages-folder #766

merged 3 commits into from
Apr 14, 2020

Conversation

SvenRoederer
Copy link
Contributor

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

@Akira25
Copy link
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
Contributor Author

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
@Akira25
Copy link
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
Contributor Author

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
Copy link
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
Contributor Author

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
Member

Akira25 commented Apr 13, 2020

Okay. I'm fine with that.

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.
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants