diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/alsa-lib.in | 1 | ||||
| -rw-r--r-- | rules/db41.in | 14 | ||||
| -rw-r--r-- | rules/db41.make | 18 | ||||
| -rw-r--r-- | rules/pre/Rules.make | 2 | ||||
| -rw-r--r-- | rules/sysfsutils.make | 2 |
5 files changed, 21 insertions, 16 deletions
diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in index c63716faa..71266d2ae 100644 --- a/rules/alsa-lib.in +++ b/rules/alsa-lib.in @@ -7,6 +7,7 @@ menuconfig ALSA_LIB config ALSA_LIB_RESMGR bool depends on ALSA_LIB + depends on BROKEN prompt "build resmgr" help support resmgr (optional component) diff --git a/rules/db41.in b/rules/db41.in index ab16a50e4..d7b7ef5a9 100644 --- a/rules/db41.in +++ b/rules/db41.in @@ -1,16 +1,16 @@ -menuconfig DB - bool "Berkeley DB-4 (4.1) " +menuconfig DB41 + bool "Berkeley DB-4.1 " -config DB_INSTALL_BIN_UTIL +config DB41_INSTALL_BIN_UTIL bool prompt "install db_* tools on target" - depends on DB + depends on DB41 help v4.x Berkeley Database Tools - + This package provides different tools for manipulating databases in the Berkeley v4.x database format, and includes: - + db_archive: write the pathnames of the log files no longer in use. db_checkpoint: daemon process to monitor the database log and checkpoint it periodically. @@ -20,6 +20,6 @@ config DB_INSTALL_BIN_UTIL db_dump: read a database file and write it in a format understood by db_printlog: dump log files in human readable format. db_stat: display statistics for Berkeley DB environments. - db_upgrade: upgrades the version of files and the + db_upgrade: upgrades the version of files and the databases they contain. db_verify: check the structure of files and their databases. diff --git a/rules/db41.make b/rules/db41.make index 6d1dea47a..464558f4e 100644 --- a/rules/db41.make +++ b/rules/db41.make @@ -49,6 +49,7 @@ $(STATEDIR)/db41.extract: $(db41_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DB41_DIR)) @$(call extract, DB41) + @$(call patchin, DB41) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -93,8 +94,6 @@ db41_install: $(STATEDIR)/db41.install $(STATEDIR)/db41.install: $(db41_install_deps_default) @$(call targetinfo, $@) - # FIXME - # @$(call install, DB41) $(DB41_PATH) $(DB41_ENV) make -C $(DB41_DIR)/dist install @$(call touch, $@) @@ -115,11 +114,16 @@ $(STATEDIR)/db41.targetinstall: $(db41_targetinstall_deps_default) @$(call install_fixup, db41,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") @$(call install_fixup, db41,DEPENDS,) @$(call install_fixup, db41,DESCRIPTION,missing) - - # FIXME: RSC: the wildcard will probably break; fix when needed :-) - # FIXME: RSC: use correct paths from the build directories - @$(call install_copy, db41, 0, 0, 0755, $(SYSROOT)/bin/db_*, /usr/bin/) - @$(call install_copy, db41, 0, 0, 0644, $(SYSROOT)/lib/libdb*.so*, /usr/lib/) + + cd $(SYSROOT)/usr/bin && for file in db_*; do \ + $(call install_copy, db41, 0, 0, 0755, $(SYSROOT)/usr/bin/$$file, /usr/bin/$$file); \ + done + @$(call install_copy, db41, 0, 0, 0644, $(SYSROOT)/usr/lib/libdb-4.1.so, /usr/lib/libdb-4.1.so) + @$(call install_link, db41, libdb-4.1.so, /usr/lib/libdb-4.so) + @$(call install_link, db41, libdb-4.1.so, /usr/lib/libdb.so) + @$(call install_copy, db41, 0, 0, 0644, $(SYSROOT)/usr/lib/libdb_cxx-4.1.so, /usr/lib/libdb_cxx-4.1.so) + @$(call install_link, db41, libdb_cxx-4.1.so, /usr/lib/libdb_cxx-4.so) + @$(call install_link, db41, libdb_cxx-4.1.so, /usr/lib/libdb_cxx.so) @$(call install_finish, db41) diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 8b760bf09..8ba845903 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -226,7 +226,7 @@ CROSS_ENV_PROGS := \ CROSS_ENV_PKG_CONFIG := \ SYSROOT=$(SYSROOT) \ - PKG_CONFIG=$(PTXCONF_CROSS_PREFIX)/bin/$(COMPILER_PREFIX)pkg-config + PKG_CONFIG="$(call remove_quotes,$(PTXCONF_CROSS_PREFIX)/bin/$(COMPILER_PREFIX)pkg-config)" CROSS_ENV_FLAGS := \ $(CROSS_ENV_CFLAGS) \ diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 2f00cae0d..01dba9684 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -120,7 +120,7 @@ ifdef PTXCONF_SYSFSUTILS_LIB @$(call install_link, sysfsutils, libsysfs.so.2.0.0, /lib/libsysfs.so) endif ifdef PTXCONF_SYSFSUTILS_SYSTOOL - @$(call install_copy, sysfsutils, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool, n) + @$(call install_copy, sysfsutils, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/.libs/systool, /bin/systool, n) endif @$(call install_finish, sysfsutils) |