gislab-npo / gislab

GIS.lab - total reduction of deployment and maintenance costs for complete free and open source geospatial infrastructure
http://gislab-npo.github.io/gislab/
GNU General Public License v3.0
40 stars 14 forks source link

Build patched busybox's udhcpc package for Xenial #476

Closed imincik closed 7 years ago

imincik commented 8 years ago

Build patched busybox's udhcpc package for Xenial

imincik commented 8 years ago

Build patched busybox's udhcpc package for Xenial

imincik commented 8 years ago

I have updated 'server-filter' patch for busybox 1.22 in Xenial.

imincik commented 8 years ago

But unfortunately, build is now failing with error below:

networking/udhcp/dhcpc.c:89:1: error: expected identifier before '+' token
 + IF_FEATURE_UDHCPC_FILTER(OPTBIT_I,)
 ^
networking/udhcp/dhcpc.c: In function 'udhcpc_main':
networking/udhcp/dhcpc.c:1491:15: error: 'OPT_b' undeclared (first use in this function)
     if (opt & OPT_b) { /* background if no lease */
               ^
networking/udhcp/dhcpc.c:1491:15: note: each undeclared identifier is reported only once for each function it appears in
networking/udhcp/dhcpc.c:1736:15: error: 'OPT_a' undeclared (first use in this function)
     if (opt & OPT_a) {
               ^
scripts/Makefile.build:197: recipe for target 'networking/udhcp/dhcpc.o' failed

When updating patch to 1.22 I had to apply following hunk by hand:

--- networking/udhcp/dhcpc.c
+++ networking/udhcp/dhcpc.c
@@ -1023,9 +1032,11 @@
        USE_FOR_MMU(             OPTBIT_b,)
        IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
        IF_FEATURE_UDHCP_PORT(   OPTBIT_P,)
+       IF_FEATURE_UDHCPC_FILTER(OPTBIT_I,)
        USE_FOR_MMU(             OPT_b = 1 << OPTBIT_b,)
        IF_FEATURE_UDHCPC_ARPING(OPT_a = 1 << OPTBIT_a,)
        IF_FEATURE_UDHCP_PORT(   OPT_P = 1 << OPTBIT_P,)
+       IF_FEATURE_UDHCPC_FILTER(OPT_I = 1 << OPTBIT_I,)
    };

    /* Default options */
landam commented 7 years ago

Should be not needed, see #505. Feel free to reopen if needed.