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

libedit: update to version 20240808-3.1 #24770

Merged
merged 3 commits into from
Aug 16, 2024
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libs/libedit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=libedit
PKG_VERSION:=20240517-3.1
PKG_VERSION:=20240808-3.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're at it. Can you also fix the problem with the apk version migration?
#23706 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the change will have to be to 3.1-r20240808.
Do you know how it is with version comparisons? Because the opkg apparently considers the new version number older than the original (see opkg compare-versions 20240808-3.1 '<' 3.1-r20240808 returns false)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about that sorry

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are multiple options:

  • Inform users about this and that they should do a manual "downgrade" (really upgrade)
  • Let them use auc or owut for an upgrade, the sys upgrade tools will inform the user about the package downgrade but the user likely understand the situation.
  • Set the version to 20240808.3.1 which should be compatible with both

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Set the version to 20240808.3.1

That would then require additional Makefile variables, as the version in the original format is part of the upstream filename.

We might have an APK related wikipage with helpful hints about solutions to that kind of needs. And the new CI message might link to that page.

PKG_RELEASE:=1

PKG_MAINTAINER:=Daniel Salzman <[email protected]>
PKG_LICENSE:=BSD-3-Clause

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thrysoee.dk/editline/
PKG_HASH:=3a489097bb4115495f3bd85ae782852b7097c556d9500088d74b6fa38dbd12ff
PKG_SOURCE_URL:=https://thrysoee.dk/editline/
PKG_HASH:=5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f

PKG_INSTALL:=1

Expand Down