Skip to content

Conversation

@teleostnacl
Copy link
Contributor

@teleostnacl teleostnacl commented Jan 1, 2026

📦 Package Details

Maintainer:
@1715173329 Tianling Shen cnsztl@immortalwrt.org

Description:
According to openwrt/openwrt#21288, switch v2ray-geodata provides to use the new virtual provides semantic that enables v2ray-geoip and v2ray-geosite to be installed side-by-side.

This resolves the conflict between the v2ray-geoip and v2ray-geosite packages during make package/install .

Without this PR, the following error occurs when running make package/install:

ERROR: unable to select packages:
  v2ray-geoip-202512201334-r1:
    conflicts: v2ray-geosite-20251231040011-r1[v2ray-geodata=202512201334-r1]
               v2ray-geosite-20251231040011-r1[xray-geodata=202512201334-r1]
    satisfies: world[v2ray-geoip] luci-app-passwall2-25.12.25-r1[v2ray-geoip]
  v2ray-geosite-20251231040011-r1:
    conflicts: v2ray-geoip-202512201334-r1[v2ray-geodata=20251231040011-r1]
               v2ray-geoip-202512201334-r1[xray-geodata=20251231040011-r1]
    satisfies: world[v2ray-geosite] luci-app-passwall2-25.12.25-r1[v2ray-geosite]

🧪 Run Testing Details

  • OpenWrt Version: r32463-8e6cd2608a
  • OpenWrt Target/Subtarget: mediatek/filogic
  • OpenWrt Device: CMCC RAX3000M

✅ Formalities

  • I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

If your PR contains a patch:

  • It can be applied using git am
  • It has been refreshed to avoid offsets, fuzzes, etc., using
    make package/<your-package>/refresh V=s
  • It is structured in a way that it is potentially upstreamable
    (e.g., subject line, commit description, etc.)
    We must try to upstream patches to reduce maintenance burden.

teleostnacl added a commit to teleostnacl/openwrt-packages that referenced this pull request Jan 1, 2026
Switch v2ray-geodata provides to use the new virtual provides semantic that
enables v2ray-geoip and v2ray-geosite to be installed side-by-side.

Related: openwrt/openwrt#21288

Fixes: openwrt#28235

Signed-off-by: TeleostNaCl Dai <teleostnacl@gmail.com>
@teleostnacl teleostnacl force-pushed the fix-v2ray-geodata-provide branch from 532175d to 0b2e822 Compare January 1, 2026 07:57
@teleostnacl
Copy link
Contributor Author

Hello @GeorgeSapkin, could you please help review this?

See openwrt/openwrt#21288

Copy link
Member

@GeorgeSapkin GeorgeSapkin left a comment

Choose a reason for hiding this comment

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

Your commit message points to this PR in Fixes:. Did you mean to point it to another issue perhaps?

Edit: I usually omit empty lines between Related, Fixes and sign-off.

teleostnacl added a commit to teleostnacl/openwrt-packages that referenced this pull request Jan 1, 2026
Switch v2ray-geodata provides to use the new virtual provides semantic that
enables v2ray-geoip and v2ray-geosite to be installed side-by-side.

Related: openwrt/openwrt#21288
Fixes: openwrt#28235
Signed-off-by: TeleostNaCl Dai <teleostnacl@gmail.com>
@teleostnacl teleostnacl force-pushed the fix-v2ray-geodata-provide branch from 0b2e822 to 21bd45c Compare January 1, 2026 12:50
teleostnacl added a commit to teleostnacl/openwrt-packages that referenced this pull request Jan 1, 2026
Switch v2ray-geodata provides to use the new virtual provides semantic that
enables v2ray-geoip and v2ray-geosite to be installed side-by-side.

Related: openwrt/openwrt#21288
Related: openwrt#28235
Signed-off-by: TeleostNaCl Dai <teleostnacl@gmail.com>
@teleostnacl teleostnacl force-pushed the fix-v2ray-geodata-provide branch from 21bd45c to 964ca66 Compare January 1, 2026 12:52
@teleostnacl
Copy link
Contributor Author

Hello @GeorgeSapkin

I have omitted unnecessary empty lines. And I want to relate this PR in the commit for future reference, so maybe using “Related” would be more appropriate.

@GeorgeSapkin
Copy link
Member

I don't think there's any meaningful additional context in this PR compared to the commit description.

@GeorgeSapkin
Copy link
Member

Also you should use a GitHub username when specifying maintainers in a PR, and not a name and an email.

@teleostnacl
Copy link
Contributor Author

@GeorgeSapkin

I have edited the Maintainer and Description, please check it again, thanks a lot!

@GeorgeSapkin
Copy link
Member

And since this is modifying packaging information, you should bump the PKG_RELEASE.

Switch v2ray-geodata provides to use the new virtual provides semantic that
enables v2ray-geoip and v2ray-geosite to be installed side-by-side.

Related: openwrt/openwrt#21288
Related: openwrt#28235
Signed-off-by: TeleostNaCl Dai <teleostnacl@gmail.com>
@teleostnacl teleostnacl force-pushed the fix-v2ray-geodata-provide branch from 964ca66 to be0456c Compare January 2, 2026 03:25
@teleostnacl
Copy link
Contributor Author

And since this is modifying packaging information, you should bump the PKG_RELEASE.

@GeorgeSapkin

I’m sorry I forgot this important detail. And now I have bumped the PKG_RELEASE to 2, please check it again, thanks.

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.

2 participants