| Message ID | 20201215093531.1763475-4-a.heider@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | add ubus support to ltq-[v|a]dsl-app | expand |
On 12/15/20 10:35 AM, Andre Heider wrote: > As with ltq-vdsl-app, see previous commit. > > Signed-off-by: Andre Heider <a.heider@gmail.com> > --- > package/network/config/ltq-adsl-app/Makefile | 2 +- > .../ltq-adsl-app/patches/300-ubus.patch | 50 +++++++++++++++++++ > package/network/config/ltq-adsl-app/src | 1 + > 3 files changed, 52 insertions(+), 1 deletion(-) > create mode 100644 package/network/config/ltq-adsl-app/patches/300-ubus.patch > create mode 120000 package/network/config/ltq-adsl-app/src > > diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile > index cfd66d0ee4..e03c0911a5 100644 > --- a/package/network/config/ltq-adsl-app/Makefile > +++ b/package/network/config/ltq-adsl-app/Makefile > @@ -35,7 +35,7 @@ define Package/ltq-adsl-app > CATEGORY:=Network > TITLE:=Lantiq DSL userland tool > URL:=http://www.lantiq.com/ > - DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ltq-dsl-base > + DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ltq-dsl-base +libubox +libubus > MENU:=1 > endef > > diff --git a/package/network/config/ltq-adsl-app/src b/package/network/config/ltq-adsl-app/src > new file mode 120000 > index 0000000000..d3dfcc3b34 > --- /dev/null > +++ b/package/network/config/ltq-adsl-app/src > @@ -0,0 +1 @@ > +../ltq-vdsl-app/src > \ No newline at end of file > Is this simlink here ok? I would prefer if you package Makefile would copy this instead of this symlink. Hauke
On 25/01/2021 21:13, Hauke Mehrtens wrote: > On 12/15/20 10:35 AM, Andre Heider wrote: >> As with ltq-vdsl-app, see previous commit. >> >> Signed-off-by: Andre Heider <a.heider@gmail.com> >> --- >> package/network/config/ltq-adsl-app/Makefile | 2 +- >> .../ltq-adsl-app/patches/300-ubus.patch | 50 +++++++++++++++++++ >> package/network/config/ltq-adsl-app/src | 1 + >> 3 files changed, 52 insertions(+), 1 deletion(-) >> create mode 100644 >> package/network/config/ltq-adsl-app/patches/300-ubus.patch >> create mode 120000 package/network/config/ltq-adsl-app/src >> >> diff --git a/package/network/config/ltq-adsl-app/Makefile >> b/package/network/config/ltq-adsl-app/Makefile >> index cfd66d0ee4..e03c0911a5 100644 >> --- a/package/network/config/ltq-adsl-app/Makefile >> +++ b/package/network/config/ltq-adsl-app/Makefile >> @@ -35,7 +35,7 @@ define Package/ltq-adsl-app >> CATEGORY:=Network >> TITLE:=Lantiq DSL userland tool >> URL:=http://www.lantiq.com/ >> - >> DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) >> +libpthread +ltq-dsl-base >> + >> DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) >> +libpthread +ltq-dsl-base +libubox +libubus >> MENU:=1 >> endef >> diff --git a/package/network/config/ltq-adsl-app/src >> b/package/network/config/ltq-adsl-app/src >> new file mode 120000 >> index 0000000000..d3dfcc3b34 >> --- /dev/null >> +++ b/package/network/config/ltq-adsl-app/src >> @@ -0,0 +1 @@ >> +../ltq-vdsl-app/src >> \ No newline at end of file >> > > Is this simlink here ok? > I would prefer if you package Makefile would copy this instead of this > symlink. symlink seems to work just fine, but sure, I'll add a `cp` build step instead.
diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index cfd66d0ee4..e03c0911a5 100644 --- a/package/network/config/ltq-adsl-app/Makefile +++ b/package/network/config/ltq-adsl-app/Makefile @@ -35,7 +35,7 @@ define Package/ltq-adsl-app CATEGORY:=Network TITLE:=Lantiq DSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ltq-dsl-base + DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ltq-dsl-base +libubox +libubus MENU:=1 endef diff --git a/package/network/config/ltq-adsl-app/patches/300-ubus.patch b/package/network/config/ltq-adsl-app/patches/300-ubus.patch new file mode 100644 index 0000000000..1951efd4f6 --- /dev/null +++ b/package/network/config/ltq-adsl-app/patches/300-ubus.patch @@ -0,0 +1,50 @@ +--- a/src/dsl_cpe_control.c ++++ b/src/dsl_cpe_control.c +@@ -139,6 +139,9 @@ extern DSL_Error_t DSL_CPE_Pipe_StaticRe + #endif /* INCLUDE_DSL_RESOURCE_STATISTICS*/ + #endif + ++extern void ubus_init(); ++extern void ubus_deinit(); ++ + DSL_char_t *g_sFirmwareName1 = DSL_NULL; + DSL_char_t *g_sFirmwareName2 = DSL_NULL; + #ifdef INCLUDE_SCRIPT_NOTIFICATION +@@ -5343,6 +5346,8 @@ DSL_int_t dsl_cpe_daemon ( + signal (SIGINT, DSL_CPE_TerminationHandler); + #endif /* RTEMS*/ + ++ ubus_init(); ++ + /* Open DSL_CPE_MAX_DEVICE_NUMBER devices*/ + for (nDevice = 0; nDevice < DSL_CPE_MAX_DEVICE_NUMBER; nDevice++) + { +@@ -5738,6 +5743,7 @@ DSL_int_t dsl_cpe_daemon ( + #endif /* INCLUDE_DSL_CPE_CLI_SUPPORT */ + + DSL_CPE_CONTROL_EXIT: ++ ubus_deinit(); + + #ifdef INCLUDE_DSL_BONDING + DSL_CPE_BND_Stop((DSL_CPE_BND_Context_t*)pCtrlCtx->pBnd); +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,7 +11,7 @@ else + dsl_cpe_control_common_ldflags = + endif + +-dsl_cpe_control_LDADD = -lpthread ++dsl_cpe_control_LDADD = -lpthread -lubox -lubus + + if INCLUDE_DSL_CPE_SOAP_SUPPORT + dsl_cpe_control_LDADD += -lm +@@ -70,7 +70,8 @@ dsl_cpe_control_SOURCES = \ + dsl_cpe_control.c \ + dsl_cpe_init_cfg.c \ + dsl_cpe_linux.c \ +- dsl_cpe_debug.c ++ dsl_cpe_debug.c \ ++ dsl_cpe_ubus.c + + dsl_cpe_control_SOURCES += \ + $(dsl_cpe_control_dti_sources) diff --git a/package/network/config/ltq-adsl-app/src b/package/network/config/ltq-adsl-app/src new file mode 120000 index 0000000000..d3dfcc3b34 --- /dev/null +++ b/package/network/config/ltq-adsl-app/src @@ -0,0 +1 @@ +../ltq-vdsl-app/src \ No newline at end of file
As with ltq-vdsl-app, see previous commit. Signed-off-by: Andre Heider <a.heider@gmail.com> --- package/network/config/ltq-adsl-app/Makefile | 2 +- .../ltq-adsl-app/patches/300-ubus.patch | 50 +++++++++++++++++++ package/network/config/ltq-adsl-app/src | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 package/network/config/ltq-adsl-app/patches/300-ubus.patch create mode 120000 package/network/config/ltq-adsl-app/src