Skip to contentSkip to conversation

package/cups: change datarootdir

PATCH New Alexey Lukyanchuk 2 participants 2 messages Mar 4, 2020 – Mar 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/cups: change datarootdir

By default, buildroot clean '/usr/share/doc' at image-building, including cups datadir(usr/share/doc/cups), which stores cups web-interface. It results in web-interface will be unavailable on target system.
This patch add --datarootdir=/usr/share/cups to config options. After that cups web-interface work fine.

---
 package/cups/cups.mk | 1 +
 1 file changed, 1 insertion(+)
package/cups/cups.mk +1 -0
index da6778f30a..455da03feb 100644
@@ -18,6 +18,7 @@ endef
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
 
 CUPS_CONF_OPTS = \
+	--datarootdir=/usr/share/cups \
 	--disable-gssapi \
 	--disable-pam \
 	--libdir=/usr/lib
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/cups: change datarootdir

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alexey" == Alexey Lukyanchuk <[email protected]> writes:

By default, buildroot clean '/usr/share/doc' at image-building, including cups datadir(usr/share/doc/cups), which stores cups web-interface. It results in web-interface will be unavailable on target system.
This patch add --datarootdir=/usr/share/cups to config options. After that cups web-interface work fine.

---
 package/cups/cups.mk | 1 +
 1 file changed, 1 insertion(+)
package/cups/cups.mk +0 -0
index da6778f30a..455da03feb 100644

package/cups/cups.mk endef · line 21

Quoted 4 lines
package/cups/cups.mk +1 -0
@@ -18,6 +18,7 @@ endef
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
 
 CUPS_CONF_OPTS = \
+	--datarootdir=/usr/share/cups \

Can you be more specific? Setting datarootdir to /usr/share/cups does not really make sense, as cups appends /cups to this, so you end up with /usr/share/cups/cups/.. Did you mean --datarootdir=/usr/share? datarootdir defaults to <prefix>/share, so as we build with --prefix=/usr this is already the default value.

The only thing that gets installed under /usr/share/doc/ is afaik the things that use docdir:

docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'

grep usr/share/doc build/cups-2.3.1/.files-list.txt | head cups,./usr/share/doc/cups/de/index.html cups,./usr/share/doc/cups/es/index.html cups,./usr/share/doc/cups/ja/index.html cups,./usr/share/doc/cups/pt_BR/index.html cups,./usr/share/doc/cups/ru/index.html cups,./usr/share/doc/cups/apple-touch-icon.png cups,./usr/share/doc/cups/cups.css cups,./usr/share/doc/cups/cups-printable.css cups,./usr/share/doc/cups/index.html cups,./usr/share/doc/cups/robots.txt

Debian "solves" this by putting these things under /usr/share/cups/doc-root:

dpkg -L cups-server-common | grep cups.css
/usr/share/cups/doc-root/cups.css

So I've changed your patch to use --with-docdir=/usr/share/cups/doc-root and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard