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

reuse LUCI build-support #188

Closed
wants to merge 7 commits into from
Closed

reuse LUCI build-support #188

wants to merge 7 commits into from

Conversation

SvenRoederer
Copy link
Contributor

@SvenRoederer SvenRoederer commented May 25, 2019

This PR implements the use of "luci.mk" from the LUCI feed to reuse its macros and definitions. So the packages-makefiles can be kept a bit more simple and use features like SRCDIET and automatic build of translations.
Some of our packages will be changed to use versionnumbering based on the githash, which removes the need for taking care of this "detail".

This also fixes freifunk-berlin/firmware#584

@SvenRoederer
Copy link
Contributor Author

The build-directory looks like this after adding this:

Index of /buildbot/unstable/ar71xx-generic/1356/packages/packages/mips_24kc/packages_berlin/

Packages                                           25-May-2019 15:45               11128
Packages.gz                                        25-May-2019 15:45                2824
Packages.manifest                                  25-May-2019 15:45               13984
Packages.sig                                       25-May-2019 15:45                 151
collectd-dnsmasq-addon_0.0.3-1_all.ipk             25-May-2019 15:32                1600
collectd-snmp-templates_0.0.3-1_all.ipk            25-May-2019 15:32                5554
freifunk-berlin-bbbdigger_git-19.144.83156-b931..> 25-May-2019 15:31                1950
freifunk-berlin-dhcp-defaults_git-19.144.83156-..> 25-May-2019 15:31                1333
freifunk-berlin-firewall-defaults_git-19.144.83..> 25-May-2019 15:31                1759
freifunk-berlin-freifunk-defaults_git-19.144.83..> 25-May-2019 15:25                1117
freifunk-berlin-lib-guard_git-19.144.83156-9a79..> 25-May-2019 15:25                1208
freifunk-berlin-migration_0.6.2-1_all.ipk          25-May-2019 15:25                7689
freifunk-berlin-network-defaults_git-19.145.378..> 25-May-2019 15:30                2882
freifunk-berlin-olsrd-defaults_git-19.144.83156..> 25-May-2019 15:31                2051
freifunk-berlin-openvpn-files_git-19.144.83156-..> 25-May-2019 15:33                2539
freifunk-berlin-statistics-defaults_git-19.144...> 25-May-2019 15:31                1741
freifunk-berlin-system-defaults_git-19.144.8315..> 25-May-2019 15:25                1079
freifunk-berlin-tunneldigger_2017-12-13-d7db350..> 25-May-2019 15:31               15027
freifunk-berlin-uhttpd-defaults_git-19.144.8315..> 25-May-2019 15:30                1179
freifunk-berlin-uplink-ipredator-files_0.0.2-1_..> 25-May-2019 15:33                3191
freifunk-berlin-uplink-notunnel-files_0.2.1-1_a..> 25-May-2019 15:31                1730
freifunk-berlin-uplink-tunnelberlin-files_0.2.1..> 25-May-2019 15:33                5279
freifunk-berlin-uplink-tunnelberlin-tunneldigge..> 25-May-2019 15:31                1876
luci-app-ffwizard-berlin_git-19.144.80997-3b4c7..> 25-May-2019 15:32               15580
luci-app-owm-ant_0.5.0_all.ipk                     25-May-2019 15:32                2082
luci-app-owm-cmd_0.5.0_all.ipk                     25-May-2019 15:32                2053
luci-app-owm-gui_0.5.0_all.ipk                     25-May-2019 15:32                1992
luci-app-owm_0.5.0_all.ipk                         25-May-2019 15:32                5613
luci-i18n-freifunk-ui-de_git-19.144.80997-1749c..> 25-May-2019 15:32                4336
luci-i18n-freifunk-ui-en_git-19.144.80997-1749c..> 25-May-2019 15:32                1098
luci-mod-freifunk-ui_git-19.144.80997-1749cd4-1..> 25-May-2019 15:32               13558

@pmelange
Copy link
Contributor

Is this for OpenWrt 18.x or 19.x or both?

@SvenRoederer
Copy link
Contributor Author

For all recent OpenWrt-versions, that would also work for 17.01 based Hedy.
It's the same as freifunk/openwrt-packages@ac16b4a + freifunk/openwrt-packages@3031c3a

@SvenRoederer
Copy link
Contributor Author

Is this change a way we'd like to go for or do we want to keep the manual versioning?

SvenRoederer and others added 7 commits December 25, 2019 11:46
The luci.mk file of the LUCI-feed provides some usefull macros
and definitions to build (luci based) packages. These macros
include SRCDIET, JSMIN, CSSTIDY and automatic build of translations.
This script checks the root of every feed for the luci.k file and
includes it.
this switches to git-hash versionnumbering
this is a direct copy from luci-feeds luci.mk
So a commit to a package will not change the versionnumber of all
packages of the feed.
rely on freifunk-berlin-generic.mk as bridge
@SvenRoederer
Copy link
Contributor Author

merged with c212966

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.

building of owm-app should honor the CONFIG_LUCI_SRCDIET flag
2 participants