search

freifunk-berlin / firmware

DEPRECATED: Build system for Berlin firmware. Please user the pinned falter-repos instead
https://berlin.freifunk.net
GNU General Public License v3.0
74 stars 34 forks source link

freifunk-berlin-lib-guard: empty package for OpenWrt-master #814

Closed PolynomialDivision closed 4 years ago

PolynomialDivision commented 4 years ago

/lib/functions/guard.sh is not available after compiling the package with imagebuilder and installing it.

I think you can not do this: https://github.com/freifunk-berlin/firmware-packages/blob/master/addons/freifunk-berlin-lib-guard/Makefile#L31

PolynomialDivision commented 4 years ago

Sry, I think this should work, but for me it is not working. :/

PolynomialDivision commented 4 years ago

Finally I know why the package has problems: https://github.com/freifunk-berlin/firmware-packages/blob/master/addons/freifunk-berlin-lib-guard/Makefile#L6

Just replacing this with include $(INCLUDE_DIR)/package.mk works! :)

SvenRoederer commented 4 years ago

Just did a curl freifunk-berlin-lib-guard_git-19.359.40465-6e5046b-2_all.ipk |tar -xz ./data.tar.gz --to-stdout | tar -tzv

for 19.07 (Firmware: git branch "upstream-1907", revision 99d94ca) it resulted in 

drwxr-xr-x root/root         0 2019-09-06 10:29 ./
drwxr-xr-x root/root         0 2019-09-06 10:29 ./lib/
drwxr-xr-x root/root         0 2019-09-06 10:29 ./lib/functions/
-rw-r--r-- root/root       656 2019-09-06 10:29 ./lib/functions/guard.sh

for openwrt-master (Firmware: git branch "upstream-master", revision b63ae31) result was:

drwxr-xr-x root/root         0 2019-09-06 10:29 ./

Indeed OpenWrt-master behaves different and produces an empty package.

Just replacing this with include $(INCLUDE_DIR)/package.mk works! :)

But this skips a lot of shorthand definitions that are done in freifunk-generic.mk and luci.mk

SvenRoederer commented 4 years ago

probably there is something bad in https://github.com/freifunk-berlin/firmware/blob/daily/upstream-master/patches/packages/luci/0202-split-luci-base_PR2817.patch which causes this

PolynomialDivision commented 4 years ago

probably there is something bad in https://github.com/freifunk-berlin/firmware/blob/daily/upstream-master/patches/packages/luci/0202-split-luci-base_PR2817.patch which causes this

I'm currently debugging the Makefile. All includes work. Can we maybe push a temporary workaround? I will stay with your luci.mk-search solution, but maybe we switch to official package.mk include for all non luci-relevant stuff?

SvenRoederer commented 4 years ago

I suggest:

currently this is full functional (http://77.245.36.54:8000/firmwares/unstable/ramips-mt7620/)

PolynomialDivision commented 4 years ago

I suggest:

* getting [openwrt/luci#2637](https://github.com/openwrt/luci/pull/2637) merged

  * temporarly use: https://github.com/SvenRoederer/freifunk-berlin-firmware/tree/next/patches/packages/luci/0008* (up to 0011*)

* merging https://github.com/SvenRoederer/freifunk-berlin-firmware/tree/next/patches/packages/packages_berlin/0003* (up to 0008*)

currently this is full functional (http://77.245.36.54:8000/firmwares/unstable/ramips-mt7620/)

I can not access your links?

SvenRoederer commented 4 years ago

I suggest:

* getting [openwrt/luci#2637](https://github.com/openwrt/luci/pull/2637) merged
  * temporarly use: https://github.com/SvenRoederer/freifunk-berlin-firmware/tree/next/patches/packages/luci/0008* (up to 0011*)

being extra verbose ....

PolynomialDivision commented 4 years ago

Sry, I'm overwhelmed by this number of patches. Why not putting this upstream? I'm afraid that this makes things complicated.

SvenRoederer commented 4 years ago

Most of the mentioned patches have been accepted upstream (https://github.com/openwrt/luci/pull/2817#issuecomment-660873641; https://github.com/openwrt/luci/commit/3b2a1e9e1129e77c4ebd5e7ace35653969f2d515#diff-2d8a7a9b9acd99058ff6f4d496ea6ebe) and only 2 patches pending as https://github.com/openwrt/luci/pull/2637.