Packet size in pkginfo/VERSION results in merge conflicts

[sebastianertz]

If two developers work on different Features, changes the packet size in pkginfo/VERSION to different values. This results in merge conflicts.

Insert pkginfo/VERSION in .gitignore does not help. Because the file will be ignored and the version can not be up counted.

The packet size must be in a separate file, to ignore with a entry in .gitignore. This is a baf [beroFix application framework] problem.

[sebastianertz]

@crich Do not you have this problem?

[crich]

This is even a userapp installer Problem. We need to distinguish between static Meta Data and dynamic Meta Data. I think there are 2 dynamic Values right now:

• packet size
• release Version

The static content, like the App Name, the description and so forth could reside in a pkginfo/META file.

"baf make" could generate the VERSION file dynamicaly and so it could be ignored by .gitignore.

comments?

[sebastianertz]

That would be great.

pkginfo/META is static and looks like that:

NAME=OpenPBX
VERSION=11
DESCRIPTION="GUI for asterisk berofix app"
NEED_KERNEL=1
NEED_ROOTFS=3
SLOTS=1
NEED_APPFS=2
TYPE=userappfs
NEED_FIRMWARE=1

baf make generates pkginfo/VERSION and we can insert this file in .gitignore

NAME=OpenPBX
VERSION=11
DESCRIPTION="GUI for asterisk berofix app"
NEED_KERNEL=1
NEED_ROOTFS=3
SLOTS=1
NEED_APPFS=2
TYPE=userappfs
NEED_FIRMWARE=1
SIZE=285090

[sebastianertz]

release Version is not dynamic, it must into the repo (at least in release-x.y.z branch) , only packet size is dynamic.

[ghost]

This has been fixed in the current version of baf. To test the new behaviour, please fetch the new version of baf from:

http://developer.beronet.com/index.php/Developer#I_want_to_become_a_beroFix_Developer

The static template is now called pkginfo/VERSION_META from it pkginfo/VERSION is generated.

[crich]

i have removed pkginfo/VERSION now and added it to .gitignore.

[sebastianertz]

Thanks, that really better.