Commit Graph

23 Commits

Author SHA1 Message Date
Paul Fertser 0c10c224be treewide: remove AUTORELEASE
Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used.

The following temporary change was made to the core:

diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
 abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))

 COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))

 all:
 FORCE: ;

And this command used to fix affected packages:

for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \
                              sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
  make package/$i/download
done

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
2023-04-21 22:46:58 +02:00
Rosen Penev 7dc5f0b436 fish: update to 3.5.0
Various other cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-06-22 16:34:36 -06:00
Stijn Tintel 4e35ada04f fish: don't build docs
Building docs fails due to fish_indent not being available. As we don't
install docs anyway, simply disable docs build.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2021-08-15 02:11:31 +03:00
Rosen Penev 9519819d66 fish: update to 3.3.1
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-07-21 00:12:56 -07:00
Rosen Penev 2e654b19f3 treewide: back to cmake.mk
Ninja was merged to base and therefore we can now use normal cmake.mk

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-06-12 21:05:01 -07:00
Rosen Penev 6abb64b316 fish: update to 3.2.2
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-06-01 23:00:48 -07:00
Rosen Penev 464223cdab fish: update to 3.2.1
Switch to AUTORELEASE for simplicity.

Switch to building with Ninja for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-03-26 13:14:42 -07:00
Curtis Jiang 6ba2a55b07 fish: update to 3.2.0
Signed-off-by: Curtis Jiang <jqqqqqqqqqq@gmail.com>
2021-03-07 23:00:43 -05:00
Rosen Penev bf0619b3fa
fish: remove CMAKE_INSTALL
PKG_INSTALL is already default. There's also no need for InstallDev.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-07-07 16:03:53 -07:00
Curtis Jiang db596f132b fish: update to 3.1.2
Signed-off-by: Curtis Jiang <jqqqqqqqqqq@gmail.com>
2020-05-03 14:48:53 -04:00
Rosen Penev bee0bfe862
fish: update to 3.1.0
Remove upstreamed patches.

Added missing libatomic dependency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-19 17:22:51 -08:00
Rosen Penev a135cbb9f1
fish: Fix compilation with libcxx
cxxabi.h is a useless header that libcxx does not include.

Remove indent on postint script. It should be on the same as the above
section.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-12-18 12:01:21 -08:00
Rosen Penev faa8962178
fish: Convert to CMake
CMake is faster and allows to simplify the Makefile slightly. It also
creates a slightly smaller package for some reason.

Fixed license information.

Ran postinst through shellcheck. It was using bashisms.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-11-20 10:21:55 -08:00
Jeffery To 53e1692ae9 treewide: Use default PKG_BUILD_DIR when possible
This removes lines that set PKG_BUILD_DIR when the set value is no
different from the default value.

Specifically, the line is removed if the assigned value is:

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

  The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT
  if it is set, so now this is identical to the default value.

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)

  if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it
  the same as the previous case

* $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

  This is the same as the default PKG_BUILD_DIR when there is no
  BUILD_VARIANT.

* $(BUILD_DIR)/[name]-$(PKG_VERSION)

  where [name] is a string that is identical to PKG_NAME

[1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-10-13 02:01:34 +08:00
Jan Pavlinec 299e5b0a9b
treewide: add PKG_CPE_ID for better cvescanner coverage
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-17 12:40:26 +02:00
Rosen Penev 85bc7bc4f3
fish: Fix wrong dependency
UCLIBC should be USE_UCLIBC

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-05-27 16:55:02 -07:00
Rosen Penev a74791edfe fish: Do not build with uClibc-ng
fish requires locale_t, which uClibc-ng does not enable by default.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-05-20 18:02:31 -07:00
Hao Dong a070d0e664 fish: update to v3.0.2
Signed-off-by: Hao Dong <halbertdong@gmail.com>
2019-02-20 01:31:36 +08:00
Hao Dong bcd30e0c81 fish: updated to v3.0.0, revert "apropos fix" for being fixed officially
Signed-off-by: Hao Dong <halbertdong@gmail.com>
2018-12-31 01:45:21 +08:00
Hannu Nyman 74a17bf87f
Merge pull request #7770 from jqqqqqqqqqq/master
fish: fixed apropos not found
2018-12-27 15:46:14 +02:00
Curtis Jiang 94cdc5adc7 fixed apropos not found
Signed-off-by: Curtis Jiang <jqqqqqqqqqq@qq.com>
2018-12-27 21:30:52 +08:00
Daniel Engberg 497bb4ff0c
fish: Add (lib)pcre2 dependency
Use the shared version of libpcre2 instead of bundled.

Fixes the following error:
Package fish is missing dependencies for the following libraries:
libpcre2-32.so.0

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2018-10-21 10:53:28 +02:00
Curtis Jiang 64920f50c0 fish: add package fish shell
Signed-off-by: Curtis Jiang <jqqqqqqqqqq@qq.com>
2018-08-31 21:57:28 -04:00