Luci 24.x -> 25? 24.10-rc5

bcookatwrt · January 8, 2025, 2:22pm

recently starting building openwrt and trying to work through newbie things..

I've added luci and luci-ssl and a few other things and everything seems predictable.. but I checked luci package-manager or opkg update.. and it seems there are luci updates..

luci 24.xyz -> 25.006 in particular..

I did ./script/feeds clean and update -a and install -a.. but I keep getting the same 24.x luci

also

kmod-ipt-conntrack and kmod-ipt-nat look to be dependencies

when I do a:

./script/feed search kmod-ipt

I do not see kmod-ipt-nat or kmod-ipt-conntrack

I see in feeds.conf.default there are src-git with hash entries..

I see the 'selecting hash' heading in the wiki

my feeds.conf.default:

src-git packages https://git.openwrt.org/feed/packages.git^c84e022ee9fae5884a7c698746bfac4d74a12a2d
src-git luci https://git.openwrt.org/project/luci.git^65c86ed3244f5ad3dc5fdfca93f40b20ab2f550c
src-git routing https://git.openwrt.org/feed/routing.git^84d97e684bcb6a63dbfdfbfd9ec7407192861239
src-git telephony https://git.openwrt.org/feed/telephony.git^fd605af7143165a2490681ec1752f259873b9147

I've been trying to get the 'head' branch of 24.10 to try and keep in sync..

but from here:

https://git.openwrt.org/?p=feed/packages.git;a=shortlog

I cannot seem to figure out what I want to use to keep the packages (and their updates) for 24.10.. (from the wiki first line -

Select a specific code revision hash and sync all feeds to the same date.
REV_HASH="4c73c34ec4215deb690bf03faea2a0fe725476f0"

) where is that hash (not that particular one.. ) but where is that in general? where did they get it from?

(also)

I put .config and .config.old into git which changed the branch.. (in the shell prompt.. is that related? )

git pull https://git.openwrt.org/openwrt/openwrt.git v24.10.0-rc5

(so at the end of all this.. )

how can I follow 24.10 'feeds' (I think that's what I'm looking for)

Do I just remove those hash entries? (but that seems like I'll be following master..)

disclaimer * I'm not a git person, but I've been using it on my own for a few years.. so possibly this is something that a "regular day job developer" would be aware of.. (sorry if this is one of those things.. )

Thank you in advance..

egc · January 8, 2025, 2:33pm

Switch to 24.10 ( git checkout openwrt-24.10) and do git pull followed by ./scripts/feeds update -a && ./scripts/feeds install -f

bcookatwrt · January 8, 2025, 2:35pm

thank you and sorry..

git tag does not show me a 24.10

git pull https://git.openwrt.org/openwrt/openwrt.git
git tag | grep v24
v24.10.0-rc1
v24.10.0-rc2
v24.10.0-rc3
v24.10.0-rc4
v24.10.0-rc5

bcookatwrt · January 8, 2025, 2:37pm

(am I missing something?)

egc · January 8, 2025, 2:41pm

You do not use a tag in these case but a branch:git branch -a

bcookatwrt · January 8, 2025, 2:42pm

didn't see your updated reply..

git checkout openwrt-24.10 --force
[I] whodis@void-d51d87 ~/openwrt (openwrt-24.10)> git pull
From https://git.openwrt.org/openwrt/openwrt
   285bdd29cb..4abd819683  main       -> origin/main
   285bdd29cb..4abd819683  master     -> origin/master
Already up to date.

ran update -a

[I] whodis@void-d51d87 ~/openwrt (openwrt-24.10)> ./scripts/feeds search kmod-ipt
Search results in feed 'packages':
kmod-ipt-account                ACCOUNT netfilter module
kmod-ipt-asn                    asn netfilter module
kmod-ipt-chaos                  CHAOS netfilter module
kmod-ipt-compat-xtables         API compatibilty layer netfilter module
kmod-ipt-condition              Condition netfilter module
kmod-ipt-coova                  Coova netfilter module
kmod-ipt-delude                 DELUDE netfilter module
kmod-ipt-dhcpmac                DHCPMAC netfilter module
kmod-ipt-dnetmap                DNETMAP netfilter module
kmod-ipt-fuzzy                  fuzzy netfilter module
kmod-ipt-geoip                  geoip netfilter module
kmod-ipt-iface                  iface netfilter module
kmod-ipt-ipmark                 IPMARK netfilter module
kmod-ipt-ipp2p                  IPP2P netfilter module
kmod-ipt-ipv4options            ipv4options netfilter module
kmod-ipt-length2                length2 netfilter module
kmod-ipt-logmark                LOGMARK netfilter module
kmod-ipt-lscan                  lscan netfilter module
kmod-ipt-lua                    Lua PacketScript netfilter module
kmod-ipt-nathelper-rtsp         RTSP Conntrack and NAT netfilter module
kmod-ipt-proto                  PROTO netfilter module
kmod-ipt-psd                    psd netfilter module
kmod-ipt-quota2                 quota2 netfilter module
kmod-ipt-sysrq                  SYSRQ netfilter module
kmod-ipt-tarpit                 TARPIT netfilter module
Search results in feed 'telephony':
kmod-ipt-rtpengine              Sipwise rtpengine netfilter module
rtpengine                       Sipwise RTP Engine
rtpengine-no-transcode          Sipwise RTP Engine (no transcoding)

still no kmod-ipt-nat

(thank you and sorry.. )

bcookatwrt · January 8, 2025, 2:49pm

just did a new pull..

git clone https://git.openwrt.org/openwrt/openwrt.git -b openwrt-24.10
./scripts/feeds update

and this is feeds.conf.default:

src-git packages https://git.openwrt.org/feed/packages.git;openwrt-24.10
src-git luci https://git.openwrt.org/project/luci.git;openwrt-24.10
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-24.10
src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-24.10

makes sense..

still no kmod-ipt-nat (heh)

 ./scripts/feeds search kmod-ipt | grep nat
kmod-ipt-nathelper-rtsp         RTSP Conntrack and NAT netfilter module

but will see what happens with the build..

egc · January 8, 2025, 2:51pm

I do not know what should be available but git status will show current status and with git log -p -2 you will get the two latest commits (-p shows detailed commit, -2 is the number, use PgDn button to scroll , and q to quit)

In the menu you can search with /

hnyman · January 8, 2025, 2:53pm

What makes you to think that it would be in the "feeds"?
It is in the main OpenWrt repo.

From 24.10 main sources.

github.com

openwrt/openwrt/blob/c06d4df9748aea84b9a4ffcbe51b2e6fff94de1e/package/kernel/linux/modules/netfilter.mk#L516-L530


      
          define KernelPackage/ipt-nat
            TITLE:=Basic NAT targets
            KCONFIG:=$(KCONFIG_IPT_NAT)
            FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).ko)
            AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_NAT-m)))
            $(call AddDepends/ipt,+kmod-nf-nat)
          endef
          
          define KernelPackage/ipt-nat/description
           Netfilter (IPv4) kernel modules for basic NAT targets
           Includes:
           - MASQUERADE
          endef
          
          $(eval $(call KernelPackage,ipt-nat))

There is nothing more about it, as the whole source comes in the Linux source.

bcookatwrt · January 8, 2025, 2:57pm

(ignorantly)

I thought b/c it was showing up as a luci dependency; that it was a feed..

(which) is why I also didn't understand why I didn't have it.. b/c I also could not find it in the feeds..

egc · January 8, 2025, 3:02pm

In the menu you can search with /

Symbol: PACKAGE_kmod-ipt-nat [=n]                                                                                           │  
  │ Type  : tristate                                                                                                            │  
  │ Defined at tmp/.config-package.in:15506                                                                                     │  
  │   Prompt: kmod-ipt-nat........................................... Basic NAT targets                                         │  
  │   Location:                                                                                                                 │  
  │     -> Kernel modules                                                                                                       │  
  │       -> Netfilter Extensions                                                                                               │  
  │ (1)     -> kmod-ipt-nat........................................... Basic NAT targets (PACKAGE_kmod-ipt-nat [=n])            │  
  │ Selects: PACKAGE_kmod-ipt-core [=y] && PACKAGE_kmod-nf-nat [=y]                                                             │  
  │ Selected by [n]:                                                                                                            │  
  │   - PACKAGE_firewall [=n] && (m && MODULES [=y] || PACKAGE_firewall4 [=y]!=y)                                               │  
  │   - PACKAGE_kmod-ipt-dnetmap [=n]                                                                                           │  
  │   - PACKAGE_kmod-ipt-nat-extra [=n]                                                                                         │  
  │   - PACKAGE_kmod-ipt-nat6 [=n] && IPV6 [=y]                                                                                 │  
  │   - PACKAGE_kmod-ipt-nathelper-rtsp [=n]                                                                                    │  
  │   - PACKAGE_dockerd [=n] && !mips [=n] && !mips64 [=n] && !mipsel [=n] && (aarch64 [=n] || arm [=y] || i386 [=n] || i686 [= │  
  │

So it looks like it is old iptables and as we are using nftables I assume we use kmod-nf-nat?

bcookatwrt · January 8, 2025, 3:35pm

(insert bugs bunny voice here)

you might Rabbit, you might.

heh

make -j(nproc) kernel_menuconfig will be going for a while..

(thank you in advance)

hnyman · January 8, 2025, 3:39pm

Sounds strange and unnecessary, as this is in the normal OpenWrt menuconfig stuff, not low-level kernel tweaking.

Ps. Normal builders will almost never need to access kernel_menuconfig

Pps. Multi-core make for the interactive menuconfig sounds unnecessary, too, as there is only one of you.

bcookatwrt · January 8, 2025, 3:41pm

(that's how this all began.. )

I needed/wanted westwood ..