summaryrefslogtreecommitdiffhomepage
path: root/luci.mk
AgeCommit message (Collapse)Author
2024-11-09luci.mk: Add apk compatibility to PKG_RELEASE handlingHannu Nyman
Most LuCI packages have automatic versioning, but some use manual versioning, and compatibility with apk requires 'r' to be added into PKG_RELEASE in style of 1.2.7-r17 Modify luci.mk to behave similarly as the the generic packages Makefile. Add 'r' prefix to PKG_RELEASE. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2024-04-20luci.mk: remove unnecessary i18n postinst scriptHannu Nyman
OpenWrt master has since 2016 run the uci-defaults also in run-time installations as postinst: openwrt/openwrt@9b9c78e Remove the older separate implementation from LuCI. Fixes #7070 and #7073 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2024-04-13Merge pull request #7042 from stangri/master-luci.mkHannu Nyman
luci.mk: include release in version number
2024-04-08luci.mk: include release in version numberStan Grishin
Fixes issue mentioned in https://github.com/openwrt/luci/pull/7009#issuecomment-2035504461 where the IPK filename doesn't contain release from the luci-app Makefile. Signed-off-by: Stan Grishin <stangri@melmac.ca>
2024-04-07luci.mk: more APK version compatibility changesPaul Spooren
The initial commit did not take care of corner cases which could happen if building under build conditions other than using Git. There are three cases for the `findrev` function: - git -> 24.079.58964~7943616 (remove prefixed `git-`) APK can't handle `git-` as prefix, it could be `0_git<integer>` but this seems rather confusing. - date -> 0.240326.34906 ( add leading 0) Add a leading zero so the version is always lower compared to using Git. This makes it easier to distinguish from a Git based version. - unknown -> 0 (instead of `unknown`) APK can't handle `unknown` so set it to a simple zero instead. Signed-off-by: Paul Spooren <mail@aparcar.org>
2024-03-21luci.mk: make APK version compliantPaul Spooren
APK expects hashes to be prefixed with a ~ Signed-off-by: Paul Spooren <mail@aparcar.org>
2024-01-03build: update build/i18n-* toolsPaul Donald
modify i18n-add-language.sh so it can: - be run from any path - bootstrap any (or all) po folder(s) with existing language(s) - (partially) update luci.mk with new languages deprecate build/i18n-init.sh Signed-off-by: Paul Donald <newtwen@gmail.com>
2023-07-27build: enable packaging of Lithuanian translationsJo-Philipp Wich
Ref: https://github.com/openwrt/luci/issues/3183#issuecomment-1652824925 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25luci.mk: fix compatibility with GNU Make 4.2Jo-Philipp Wich
GNU Make version 4.2 chokes on `#` characters embedded in variable substitutions, leading to the following error: ../../luci.mk:114: *** unterminated call to function 'if': missing ')'. Stop. Avoid this problem by replacing variable substitutions with Git branch format arguments. Ref: https://github.com/openwrt/luci/pull/5976#issuecomment-1289935106 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25luci.mk: automatically depend on luci-lua-runtimeJo-Philipp Wich
Make packages having a non-empty luasrc/ directory automatically depend on the LuCI Lua runtime package. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25luci.mk: add basic support for ucode sourcesJo-Philipp Wich
Add special handling for ucode/ package subdirs, analogeous to luasrc/. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25luci.mk: adjust path of purged index cache filesJo-Philipp Wich
The index cache files have been split into separate, dynamically named Lua and JSON files a while ago, so adjust the remove command in the postinstall script accordingly. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25luci.mk: typo and indentation fixesJo-Philipp Wich
- Fix misspelled comment - Fix wrong variable in Lua SrcDiet condition - Fix wrong indentation Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25luci.mk: rework logic to determine current branchJo-Philipp Wich
In case `git branch --remote` yields no result, fall back to `git branch` without `--remote` since it is possible that the local branch has not been pushed yet. Also simplify extraction of the branch name by not passing `--verbose` and utilizing variable substitutions instead of sed expressions. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-09-30luci.mk: refactor install recipeJo-Philipp Wich
Detect the presence of directories using Make $(wildcard ...) and emit plain install commands depending on the outcome instead of relying on shell conditionals which impose syntax constraints on code outside of the scope of the LuCI repo. Fixes: #5936 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-07-22luci.mk: disable english translation packagesJo-Philipp Wich
Since english is the implementation language of LuCI, it makes no sense to ship translation packages for it. Ref: #5860 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-07-22luci.mk: ignore language directories not explicitly mentionedJo-Philipp Wich
Only create translation packages for languages mentioned in luci.mk Fixes: #5886 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-04-06build: introduce official way to opt out of source minificationJo-Philipp Wich
Introduce three new default enabled variables `LUCI_MINIFY_JS`, `LUCI_MINIFY_LUA` and `LUCI_MINIFY_CSS` that allow LuCI component Makefiles to opt out of JavaScript, Lua and CSS compression respectively. To e.g. inhibit CSSTidy postprocessing in a theme, the corresponding Makefile can set `LUCI_MINIFY_CSS:=0` prior to including `luci.mk`. Fixes: #5755 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-11-07translation: add Danish to luci.mkHannu Nyman
Define Dansk/Danish language in luci.mk. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-06-04luci.mk: don't run uci-defaults scripts ourselfSven Roederer
Do not run the uci-defaults scripts of a package in the package-postinst, but leave this for the default_postinst() of the OpenWrt base-files package. Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2021-06-02luci.mk: make SUBMENU package define customizable and optionalSven Roederer
When including luci.mk in external repos it's sometimes usefull to not use the default LuCI-submenu hierarchy. This change defines the LUCI_SUBMENU_FORCED variable which completely overrides the default submenu of the LuCI config-section. When LUCI_SUBMENU_FORCED is not defined, the default submenu derrived from LUCI_TYPE or "Application" fallback is used. Defining LUCI_SUBMENU_FORCED in the package Makefile will just use this value. Setting it to "none" will not define a submenu at all. Together with LUCI_SECTION and LUCI_CATEGORY menu items can now created at any place in the menu structure. Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2021-06-02luci.mk: add PKG_PROVIDES make-macro to set package/provides optionSven Roederer
Add PKG_PROVIDES macro to be passed down to buildpackage defines as PROVIDES variable. Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2021-06-02luci.mk: add URL and MAINTAINER fields to package-definitionsSven Roederer
Add the LUCI_URL and LUCI_MAINTAINER variables to pass them to the buildpackage defines. Give them some sane defaults and allow overwritting by the individual package. Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
2020-10-25build: luci.mk: Fix warning in Kconfig for Dutch languageHauke Mehrtens
When the Dutch translation was added there was no name for the language added, this created such a Kconfig entry: config LUCI_LANG_nl tristate " (nl)" This entry created the following warning message when doing make oldconfig in OpenWrt: tmp/.config-package.in:24525:warning: leading whitespace ignored This is fixed here by adding a name to the language. Fixes: 1e301ca2dfe2 ("Translated using Weblate (Dutch)") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2020-07-20build: luci.mk: allow overriding menu category and section valuesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-07-19luci.mk: reorder to have common-things in a blockSven Roederer
The luci.mk file has grown over the years and became more complex. This change reorders some sections to make it more easy to read and understand on the first view. * move all constants into a common block * put all standard package definitons together * put the specific sections for the "luci-base" behind the common things * have the defines for the translations at the very end Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
2020-05-21translation: add Arabic to luci.mkPaul Spooren
Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-05-15i18n: add Finnish to supported languagesHannu Nyman
There is some translation effort ongoing in weblate, so add also Finnish to the list of supported languages. Katsotaan riittääkö innostuneita kääntäjiä... Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-04-29translation: add Bengali to luci.mkPaul Spooren
This includes `bn_BD` and `bn` via an alias. Weblate currently does not support `bn_IN` (Indian Bangla), so I think the alias is reasonable. Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-04-15build: luci.mk: fix compatibility with older Git versionsJo-Philipp Wich
Fixes: 9d8e99f9b build: gracefully handle non-Git source trees Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-14build: luci.mk: gracefully handle missing or unversioned po subdirectoriesJo-Philipp Wich
Fixes: #3911 Fixes: 9d8e99f9b build: gracefully handle non-Git source trees Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-14Revert "build: luci.mk: gracefully handle missing or unversioned po ↵Jo-Philipp Wich
subdirectories" This reverts commit e6f77d5d72c0e13ed3eb370419abab52c4920a32. Commit contained unrelated changes. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-14build: luci.mk: gracefully handle missing or unversioned po subdirectoriesJo-Philipp Wich
Fixes: #3911 Fixes: 9d8e99f9b build: gracefully handle non-Git source trees Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-14build: gracefully handle non-Git source treesJo-Philipp Wich
Fixes: #3911 Fixes: 59fe4086f ("build: luci.mk: drop support for non-Git SCMs") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-11build: luci.mk: honour PKG_VERSION if setJo-Philipp Wich
Also pass correct variable to builds to ensure that version.lua and cache buster strings are properly interpolated. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-11luci.mk: correct titles of zh_Hans and zh_HantDENG Qingfang
zh_Hans: 简体中文 (Chinese Simplified) zh_Hant: 繁體中文 (Chinese Traditional) Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
2020-04-09build: luci.mk: rework package version handlingJo-Philipp Wich
- Derive the version of packages from the last change of the sources - Derive the version of i18n packages from the last change of the po dir Fixes: #2257 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-04-09build: luci.mk: drop support for non-Git SCMsJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-03-03build: reload rpcd in package postinstallJo-Philipp Wich
Send a SIGHUP to rpcd after installing LuCI packages to reload ACL rules. Also remove redundant code while we're at it. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-02-27luci.mk: Only install a default post-install script if there is none definedFlorian Eckert
If a postinst script is defined in the package Makefile, it will not be included because it will be replaced by the default postinst script. To solve the problem, we now check, if we have a postinst script. And if so, it will be installed instead of the default postinst script. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-02-27luci.mk: correcting a misspell for Brazilian PortugueseWellington Uemura
Reported-by: Wellington Uemura * update message header Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-02-14luci.mk: move /tmp/luci-modulecache remove to package postinst scriptFlorian Eckert
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-02-14luci.mk: move /tmp/luci-indexcache remove to package postinst scriptFlorian Eckert
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-01-29treewide: switch to bcp47 language codesJo-Philipp Wich
Fixes: #3477 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-12-29Merge pull request #3400 from TDT-AG/pr/20191210-luci-mkFlorian Eckert
luci.mk: move indexcache delete into postinst
2019-12-25Merge pull request #3352 from NeoRaider/move-luasrcdietJo-Philipp Wich
luci-base: use luasrcdiet from separate package
2019-12-11translation: add Marāṭhī to luci.mkPaul Spooren
Signed-off-by: Paul Spooren <mail@aparcar.org>
2019-12-10luci.mk: move indexcache delete into postinstFlorian Eckert
Almost every uci-defaults script for ucitrack execute after the uci commands the following line '/tmp/luci-indexcache'. So that we don't always write the same thing, we now do this in postinst. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-11-23luci-base: use luasrcdiet from separate packageMatthias Schiffer
luasrcdiet is being moved to the packages feed as a separate package. Adjust luci feed accordingly. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2019-10-30translation: Add Bulgarian to luci.mkPaul Spooren
Signed-off-by: Paul Spooren <mail@aparcar.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 17:35:40 +0000