diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-13 12:05:38 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-16 13:33:57 +0200 |
| commit | 3babd044d7d6ed274b324403dc1e3484ff62a742 (patch) | |
| tree | 2c60739ed92eb5265add514b1a34b898a4adc49b /rules | |
| parent | 0f9e9118d381be7bf38b8cf0bb0cd8af637248c9 (diff) | |
| download | ptxdist-3babd044d7d6ed274b324403dc1e3484ff62a742.tar.gz ptxdist-3babd044d7d6ed274b324403dc1e3484ff62a742.tar.xz | |
rules: used PTXDIST_SYSROOT_* instead of PTXCONF_SYSROOT_*
The value should be the same. Always use PTXDIST_SYSROOT_* for
consistency.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
33 files changed, 88 insertions, 88 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index 1a484ca01..632788d0b 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -128,7 +128,7 @@ $(STATEDIR)/barebox.install: @$(foreach prog, $(BAREBOX_PROGS_HOST), \ if [ -e $(BAREBOX_DIR)/scripts/$(prog) ]; then \ install -v -D -m755 $(BAREBOX_DIR)/scripts/$(prog) \ - $(PTXCONF_SYSROOT_HOST)/bin/$(notdir $(prog)) || exit; \ + $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog)) || exit; \ fi;) @$(foreach prog, $(BAREBOX_PROGS_TARGET_y), \ @@ -189,7 +189,7 @@ $(STATEDIR)/barebox.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX) @$(foreach prog, $(BAREBOX_PROGS_HOST), \ - rm -vf $(PTXCONF_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) + rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) @rm -vf $(IMAGEDIR)/barebox-image $(IMAGEDIR)/barebox-default-environment # ---------------------------------------------------------------------------- diff --git a/rules/bluez-qt.make b/rules/bluez-qt.make index 1b6244d79..779f5392e 100644 --- a/rules/bluez-qt.make +++ b/rules/bluez-qt.make @@ -33,7 +33,7 @@ BLUEZ_QT_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ - -DECM_DIR=$(PTXCONF_SYSROOT_HOST)/share/ECM/cmake/ + -DECM_DIR=$(PTXDIST_SYSROOT_HOST)/share/ECM/cmake/ # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/canfestival.make b/rules/canfestival.make index e28ef6b2d..4eaa7cbf6 100644 --- a/rules/canfestival.make +++ b/rules/canfestival.make @@ -56,7 +56,7 @@ $(STATEDIR)/canfestival.install.post: @$(call targetinfo) @$(call world/install.post, CANFESTIVAL) @for file in objdictedit objdictgen; do \ - ln -sf $(PTXCONF_SYSROOT_TARGET)/usr/bin/"$${file}" $(PTXCONF_SYSROOT_HOST)/bin; \ + ln -sf $(PTXDIST_SYSROOT_TARGET)/usr/bin/"$${file}" $(PTXDIST_SYSROOT_HOST)/bin; \ done @$(call touch) diff --git a/rules/ckermit.make b/rules/ckermit.make index 0157cc42a..e983803c1 100644 --- a/rules/ckermit.make +++ b/rules/ckermit.make @@ -41,7 +41,7 @@ CKERMIT_MAKEVARS := \ prefix=/usr \ CC=$(CROSS_CC) \ CC2=$(CROSS_CC) \ - WART=$(PTXCONF_SYSROOT_HOST)/bin/wart \ + WART=$(PTXDIST_SYSROOT_HOST)/bin/wart \ CFLAGS='$(CROSS_CPPFLAGS) $(CROSS_CFLAGS) -O2 -g -DLINUX -DFNFLOAT -DCK_POSIX_SIG -DCK_NEWTERM -DTCPSOCKET -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR -DCK_NCURSES -DHAVE_PTMX' \ LNKFLAGS='$(CROSS_LDFLAGS)' \ LIBS='-lncurses -lutil -lresolv -lcrypt -lm' diff --git a/rules/cross-dummy-strip.make b/rules/cross-dummy-strip.make index 696c72890..e90408ff0 100644 --- a/rules/cross-dummy-strip.make +++ b/rules/cross-dummy-strip.make @@ -14,7 +14,7 @@ CROSS_DUMMY_STRIP_LICENSE := ignore $(STATEDIR)/cross-dummy-strip.install: @$(call targetinfo) - install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXCONF_SYSROOT_CROSS)/bin/strip + install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXDIST_SYSROOT_CROSS)/bin/strip @$(call touch) # vim: syntax=make diff --git a/rules/cross-pkg-config-wrapper.make b/rules/cross-pkg-config-wrapper.make index edb37c514..c318e1d33 100644 --- a/rules/cross-pkg-config-wrapper.make +++ b/rules/cross-pkg-config-wrapper.make @@ -22,9 +22,9 @@ CROSS_PKG_CONFIG_WRAPPER_SCRIPT = \ $(STATEDIR)/cross-pkg-config-wrapper.install: @$(call targetinfo) @ln -svf $(CROSS_PKG_CONFIG_WRAPPER_SCRIPT) \ - $(PTXCONF_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config + $(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config @ln -svf $(CROSS_PKG_CONFIG_WRAPPER_SCRIPT) \ - $(PTXCONF_SYSROOT_CROSS)/bin/pkg-config + $(PTXDIST_SYSROOT_CROSS)/bin/pkg-config @$(call touch) # vim: syntax=make diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make index e80ccba77..bf92486b7 100644 --- a/rules/dbus-glib.make +++ b/rules/dbus-glib.make @@ -41,8 +41,8 @@ DBUS_GLIB_CONF_OPT := \ --disable-asserts \ --enable-checks \ --disable-gtk-doc \ - --with-dbus-binding-tool=$(PTXCONF_SYSROOT_HOST)/bin/dbus-binding-tool \ - --with-introspect-xml=$(PTXCONF_SYSROOT_HOST)/share/dbus-glib/dbus-bus-introspect.xml + --with-dbus-binding-tool=$(PTXDIST_SYSROOT_HOST)/bin/dbus-binding-tool \ + --with-introspect-xml=$(PTXDIST_SYSROOT_HOST)/share/dbus-glib/dbus-bus-introspect.xml # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/eggdbus.make b/rules/eggdbus.make index 0019b5da9..46fff9313 100644 --- a/rules/eggdbus.make +++ b/rules/eggdbus.make @@ -35,7 +35,7 @@ EGGDBUS_AUTOCONF := \ --disable-verbose-mode \ --disable-man-pages \ --disable-gtk-doc \ - --with-eggdbus-tools=$(PTXCONF_SYSROOT_HOST)/bin + --with-eggdbus-tools=$(PTXDIST_SYSROOT_HOST)/bin # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/host-apiextractor.make b/rules/host-apiextractor.make index 12977fb9a..c9d377145 100644 --- a/rules/host-apiextractor.make +++ b/rules/host-apiextractor.make @@ -43,8 +43,8 @@ HOST_APIEXTRACTOR_CONF_OPT := \ $(STATEDIR)/host-apiextractor.install.post: @$(call targetinfo) @$(call world/install.post, HOST_APIEXTRACTOR) - @sed -i -e 's,"/,"$(PTXCONF_SYSROOT_HOST)/,g' \ - '$(PTXCONF_SYSROOT_HOST)/lib/cmake/ApiExtractor-$(HOST_APIEXTRACTOR_VERSION)/ApiExtractorConfig.cmake' + @sed -i -e 's,"/,"$(PTXDIST_SYSROOT_HOST)/,g' \ + '$(PTXDIST_SYSROOT_HOST)/lib/cmake/ApiExtractor-$(HOST_APIEXTRACTOR_VERSION)/ApiExtractorConfig.cmake' @$(call touch) # vim: syntax=make diff --git a/rules/host-cramfs.make b/rules/host-cramfs.make index c2def82c2..4ad12a533 100644 --- a/rules/host-cramfs.make +++ b/rules/host-cramfs.make @@ -35,8 +35,8 @@ HOST_CRAMFS_CONF_TOOL := NO $(STATEDIR)/host-cramfs.install: @$(call targetinfo) - cp $(HOST_CRAMFS_DIR)/mkcramfs $(PTXCONF_SYSROOT_HOST)/bin - cp $(HOST_CRAMFS_DIR)/cramfsck $(PTXCONF_SYSROOT_HOST)/bin + cp $(HOST_CRAMFS_DIR)/mkcramfs $(PTXDIST_SYSROOT_HOST)/bin + cp $(HOST_CRAMFS_DIR)/cramfsck $(PTXDIST_SYSROOT_HOST)/bin @$(call touch) # vim: syntax=make diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index 3e2aa92e9..80e13e1b8 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -64,10 +64,10 @@ HOST_E2FSPROGS_INSTALL_OPT := install install-libs $(STATEDIR)/host-e2fsprogs.install.post: @$(call targetinfo) @$(call world/install.post, HOST_E2FSPROGS) - @sed -i -e 's,/share,$(PTXCONF_SYSROOT_HOST)/share,' \ - $(PTXCONF_SYSROOT_HOST)/bin/compile_et - @sed -i -e 's,/share,$(PTXCONF_SYSROOT_HOST)/share,' \ - $(PTXCONF_SYSROOT_HOST)/bin/mk_cmds + @sed -i -e 's,/share,$(PTXDIST_SYSROOT_HOST)/share,' \ + $(PTXDIST_SYSROOT_HOST)/bin/compile_et + @sed -i -e 's,/share,$(PTXDIST_SYSROOT_HOST)/share,' \ + $(PTXDIST_SYSROOT_HOST)/bin/mk_cmds @$(call touch) # vim: syntax=make diff --git a/rules/host-fontconfig.make b/rules/host-fontconfig.make index ea39a08ce..3845a23ce 100644 --- a/rules/host-fontconfig.make +++ b/rules/host-fontconfig.make @@ -38,7 +38,7 @@ HOST_FONTCONFIG_CONF_OPT := \ --disable-docs \ --with-arch=$(PTXCONF_ARCH_STRING) \ --with-default-fonts=$(XORG_FONTDIR) \ - --with-cache-dir=$(PTXCONF_SYSROOT_HOST)/var/cache/fontconfig + --with-cache-dir=$(PTXDIST_SYSROOT_HOST)/var/cache/fontconfig HOST_FONTCONFIG_MAKE_PAR := NO diff --git a/rules/host-generatorrunner.make b/rules/host-generatorrunner.make index 167f6e8f3..1e0cfef51 100644 --- a/rules/host-generatorrunner.make +++ b/rules/host-generatorrunner.make @@ -44,8 +44,8 @@ HOST_GENERATORRUNNER_CONF_OPT := \ $(STATEDIR)/host-generatorrunner.install.post: @$(call targetinfo) @$(call world/install.post, HOST_GENERATORRUNNER) - @sed -i -e 's,\(GENERATORRUNNER_PLUGIN_DIR "\)$(PTXCONF_SYSROOT_HOST),\1,g' \ - '$(PTXCONF_SYSROOT_HOST)/lib/cmake/GeneratorRunner-$(HOST_GENERATORRUNNER_VERSION)/GeneratorRunnerConfig.cmake' + @sed -i -e 's,\(GENERATORRUNNER_PLUGIN_DIR "\)$(PTXDIST_SYSROOT_HOST),\1,g' \ + '$(PTXDIST_SYSROOT_HOST)/lib/cmake/GeneratorRunner-$(HOST_GENERATORRUNNER_VERSION)/GeneratorRunnerConfig.cmake' @$(call touch) # vim: syntax=make diff --git a/rules/host-glib.make b/rules/host-glib.make index ce6a4e611..443d6577a 100644 --- a/rules/host-glib.make +++ b/rules/host-glib.make @@ -45,10 +45,10 @@ $(STATEDIR)/host-glib.install.post: @$(call targetinfo) @mkdir -p $(HOST_GLIB_PKGDIR)/share/glib-2.0/gettext @$(call world/install.post, HOST_GLIB) - @sed -i "s:'/share':'$(PTXCONF_SYSROOT_HOST)/share':" "$(PTXCONF_SYSROOT_HOST)/bin/gdbus-codegen" + @sed -i "s:'/share':'$(PTXDIST_SYSROOT_HOST)/share':" "$(PTXDIST_SYSROOT_HOST)/bin/gdbus-codegen" @sed -i -e 's:^prefix=.*:prefix=$(PTXDIST_SYSROOT_HOST):' \ -e 's:^\(datarootdir\|datadir\)=.*:\1=$(PTXDIST_SYSROOT_HOST)/share:' \ - $(PTXCONF_SYSROOT_HOST)/bin/glib-gettextize + $(PTXDIST_SYSROOT_HOST)/bin/glib-gettextize @$(call touch) # vim: syntax=make diff --git a/rules/host-intltool.make b/rules/host-intltool.make index 24649ad42..8f35c414a 100644 --- a/rules/host-intltool.make +++ b/rules/host-intltool.make @@ -39,7 +39,7 @@ HOST_INTLTOOL_CONF_TOOL := autoconf $(STATEDIR)/host-intltool.install.post: @$(call targetinfo) @$(call world/install.post, HOST_INTLTOOL) - @sed -i "s;^prefix=$$;prefix=$(PTXCONF_SYSROOT_HOST);" $(PTXCONF_SYSROOT_HOST)/bin/intltoolize + @sed -i "s;^prefix=$$;prefix=$(PTXDIST_SYSROOT_HOST);" $(PTXDIST_SYSROOT_HOST)/bin/intltoolize @$(call touch) # vim: syntax=make diff --git a/rules/host-libgd.make b/rules/host-libgd.make index 4c50e8cb8..e252b86de 100644 --- a/rules/host-libgd.make +++ b/rules/host-libgd.make @@ -30,7 +30,7 @@ HOST_LIBGD_AUTOCONF := \ $(HOST_AUTOCONF) \ --without-x \ --without-jpeg \ - --with-png=$(PTXCONF_SYSROOT_HOST) \ + --with-png=$(PTXDIST_SYSROOT_HOST) \ --without-xpm \ --without-freetype \ --without-fontconfig diff --git a/rules/host-python.make b/rules/host-python.make index 83252a761..3a8986342 100644 --- a/rules/host-python.make +++ b/rules/host-python.make @@ -16,7 +16,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON) += host-python # HOST_PYTHON_DIR = $(HOST_BUILDDIR)/$(PYTHON) -HOSTPYTHON = $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) +HOSTPYTHON = $(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare diff --git a/rules/host-python3-shiboken.make b/rules/host-python3-shiboken.make index 57f643990..2daeaba4b 100644 --- a/rules/host-python3-shiboken.make +++ b/rules/host-python3-shiboken.make @@ -37,17 +37,17 @@ HOST_PYTHON3_SHIBOKEN_CONF_OPT = \ $(STATEDIR)/host-python3-shiboken.install: @$(call targetinfo) @$(call world/install, HOST_PYTHON3_SHIBOKEN) - @sed -i -e 's,"$(PTXCONF_SYSROOT_HOST),",g' \ + @sed -i -e 's,"$(PTXDIST_SYSROOT_HOST),",g' \ $(HOST_PYTHON3_SHIBOKEN_PKGDIR)/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cpython-*.cmake @$(call touch) $(STATEDIR)/host-python3-shiboken.install.post: @$(call targetinfo) @$(call world/install.post, HOST_PYTHON3_SHIBOKEN) - @sed -i -e 's,(/,($(PTXCONF_SYSROOT_HOST)/,g' \ - '$(PTXCONF_SYSROOT_HOST)/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cmake' - @sed -i -e 's,"/,"$(PTXCONF_SYSROOT_HOST)/,g' \ - $(PTXCONF_SYSROOT_HOST)/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cpython-*.cmake + @sed -i -e 's,(/,($(PTXDIST_SYSROOT_HOST)/,g' \ + '$(PTXDIST_SYSROOT_HOST)/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cmake' + @sed -i -e 's,"/,"$(PTXDIST_SYSROOT_HOST)/,g' \ + $(PTXDIST_SYSROOT_HOST)/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cpython-*.cmake @$(call touch) # vim: syntax=make diff --git a/rules/host-python3.make b/rules/host-python3.make index 55e4f1598..c3f58be5a 100644 --- a/rules/host-python3.make +++ b/rules/host-python3.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3) += host-python3 # HOST_PYTHON3_DIR = $(HOST_BUILDDIR)/$(PYTHON3) -HOSTPYTHON3 = $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) +HOSTPYTHON3 = $(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare diff --git a/rules/host-qt4.make b/rules/host-qt4.make index c0b5fc4dd..29f31d264 100644 --- a/rules/host-qt4.make +++ b/rules/host-qt4.make @@ -172,8 +172,8 @@ else @echo -e '#!/bin/sh\nexport QMAKESPEC=linux-ptx-g++\nexec $(PTXDIST_SYSROOT_CROSS)/bin/qmake-cross "$$@"\n' > $(PTXDIST_SYSROOT_CROSS)/bin/qmake endif @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qmake - @echo -e "[Paths]\nPrefix=$(SYSROOT)/usr\nBinaries=$(PTXCONF_SYSROOT_HOST)/bin\nImports=/usr/imports" > $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf - @echo -e "[Paths]\nPrefix=$(PTXCONF_SYSROOT_HOST)" > $(PTXDIST_SYSROOT_HOST)/bin/qt.conf + @echo -e "[Paths]\nPrefix=$(SYSROOT)/usr\nBinaries=$(PTXDIST_SYSROOT_HOST)/bin\nImports=/usr/imports" > $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf + @echo -e "[Paths]\nPrefix=$(PTXDIST_SYSROOT_HOST)" > $(PTXDIST_SYSROOT_HOST)/bin/qt.conf @$(call touch) # vim: syntax=make diff --git a/rules/host-shiboken.make b/rules/host-shiboken.make index d4d60eb48..2e546d6c0 100644 --- a/rules/host-shiboken.make +++ b/rules/host-shiboken.make @@ -37,17 +37,17 @@ HOST_SHIBOKEN_CONF_OPT = \ $(STATEDIR)/host-shiboken.install: @$(call targetinfo) @$(call world/install, HOST_SHIBOKEN) - @sed -i -e 's,"$(PTXCONF_SYSROOT_HOST),",g' \ + @sed -i -e 's,"$(PTXDIST_SYSROOT_HOST),",g' \ $(HOST_SHIBOKEN_PKGDIR)/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig-python$(PYTHON_MAJORMINOR).cmake @$(call touch) $(STATEDIR)/host-shiboken.install.post: @$(call targetinfo) @$(call world/install.post, HOST_SHIBOKEN) - @sed -i -e 's,(/,($(PTXCONF_SYSROOT_HOST)/,g' \ - '$(PTXCONF_SYSROOT_HOST)/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig.cmake' - @sed -i -e 's,"/,"$(PTXCONF_SYSROOT_HOST)/,g' \ - '$(PTXCONF_SYSROOT_HOST)/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig-python$(PYTHON_MAJORMINOR).cmake' + @sed -i -e 's,(/,($(PTXDIST_SYSROOT_HOST)/,g' \ + '$(PTXDIST_SYSROOT_HOST)/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig.cmake' + @sed -i -e 's,"/,"$(PTXDIST_SYSROOT_HOST)/,g' \ + '$(PTXDIST_SYSROOT_HOST)/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig-python$(PYTHON_MAJORMINOR).cmake' @$(call touch) # vim: syntax=make diff --git a/rules/host-timeout.make b/rules/host-timeout.make index b022699f6..73f240f3a 100644 --- a/rules/host-timeout.make +++ b/rules/host-timeout.make @@ -31,7 +31,7 @@ HOST_TIMEOUT_MAKE_OPT := ../../bin/timeout $(STATEDIR)/host-timeout.install: @$(call targetinfo) @$(INSTALL) -v -m 755 -D $(HOST_TIMEOUT_DIR)/bin/timeout \ - $(PTXCONF_SYSROOT_HOST)/bin/timeout + $(PTXDIST_SYSROOT_HOST)/bin/timeout @$(call touch) # vim: syntax=make diff --git a/rules/jimtcl.make b/rules/jimtcl.make index db6df7fc0..eb39dd611 100644 --- a/rules/jimtcl.make +++ b/rules/jimtcl.make @@ -36,7 +36,7 @@ JIMTCL_CONF_TOOL := autoconf JIMTCL_CONF_ENV := \ $(CROSS_ENV) \ CCACHE=none \ - autosetup_tclsh=$(PTXCONF_SYSROOT_HOST)/bin/jimsh + autosetup_tclsh=$(PTXDIST_SYSROOT_HOST)/bin/jimsh JIMTCL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(call ptx/ifdef, PTXCONF_JIMTCL_UTF8,--utf8,) \ diff --git a/rules/kernel.make b/rules/kernel.make index 1e445559b..8b766c727 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -60,7 +60,7 @@ KERNEL_CONF_OPT := \ ifdef PTXCONF_KERNEL_MODULES_INSTALL KERNEL_CONF_OPT += \ - DEPMOD=$(PTXCONF_SYSROOT_HOST)/sbin/depmod + DEPMOD=$(PTXDIST_SYSROOT_HOST)/sbin/depmod endif ifndef PTXCONF_KERNEL_GCC_PLUGINS @@ -201,7 +201,7 @@ ifdef PTXCONF_KERNEL_MODULES_INSTALL @$(call world/install, KERNEL) endif ifdef PTXCONF_KERNEL_DTC - @install -m 755 "$(KERNEL_DIR)/scripts/dtc/dtc" "$(PTXCONF_SYSROOT_HOST)/bin/dtc" + @install -m 755 "$(KERNEL_DIR)/scripts/dtc/dtc" "$(PTXDIST_SYSROOT_HOST)/bin/dtc" endif @$(call touch) diff --git a/rules/libpvgen.make b/rules/libpvgen.make index d35e7e511..c64e3b2c7 100644 --- a/rules/libpvgen.make +++ b/rules/libpvgen.make @@ -39,11 +39,11 @@ LIBPVGEN_AUTOCONF := \ $(STATEDIR)/libpvgen.install: @$(call targetinfo) - @mkdir -p $(PTXCONF_SYSROOT_HOST)/usr/share/libpvgen + @mkdir -p $(PTXDIST_SYSROOT_HOST)/usr/share/libpvgen @for file in confignode genpv_cfile libpvgen wago; do \ ln -sf \ - $(PTXCONF_SYSROOT_TARGET)/usr/share/libpvgen/"$${file}.py" \ - $(PTXCONF_SYSROOT_HOST)/usr/share/libpvgen/"$${file}.py"; \ + $(PTXDIST_SYSROOT_TARGET)/usr/share/libpvgen/"$${file}.py" \ + $(PTXDIST_SYSROOT_HOST)/usr/share/libpvgen/"$${file}.py"; \ done @$(call touch) diff --git a/rules/mesalib.make b/rules/mesalib.make index 430b06a3d..629494ccd 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -140,7 +140,7 @@ MESALIB_CONF_OPT := \ $(STATEDIR)/mesalib.compile: @$(call targetinfo) - cp $(PTXCONF_SYSROOT_HOST)/bin/mesa/glsl_compiler $(MESALIB_DIR)/src/compiler/ + cp $(PTXDIST_SYSROOT_HOST)/bin/mesa/glsl_compiler $(MESALIB_DIR)/src/compiler/ @$(call world/compile, MESALIB) @$(call touch) diff --git a/rules/ncurses.make b/rules/ncurses.make index af22fa7e3..3d2e75ce9 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -141,7 +141,7 @@ endif $(STATEDIR)/ncurses.install.post: @$(call targetinfo) @$(call world/install.post, NCURSES) - @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXCONF_SYSROOT_CROSS)/bin" + @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXDIST_SYSROOT_CROSS)/bin" @$(call touch) # ---------------------------------------------------------------------------- diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index f3f7b935d..fcf9c5566 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -65,7 +65,7 @@ kernel/opts = \ HOSTCC=$(HOSTCC) \ ARCH=$(GENERIC_KERNEL_ARCH) \ CROSS_COMPILE=$(COMPILER_PREFIX) \ - DEPMOD=$(PTXCONF_SYSROOT_HOST)/sbin/depmod \ + DEPMOD=$(PTXDIST_SYSROOT_HOST)/sbin/depmod \ \ INSTALL_MOD_PATH=$($(1)_PKGDIR) \ PTX_KERNEL_DIR=$($(1)_DIR) diff --git a/rules/python.make b/rules/python.make index fc3bb1ac9..3cdeabd94 100644 --- a/rules/python.make +++ b/rules/python.make @@ -29,7 +29,7 @@ PYTHON_URL := \ http://python.org/ftp/python/$(PYTHON_VERSION)/$(PYTHON).$(PYTHON_SUFFIX) \ http://python.org/ftp/python/$(PYTHON_MAJORMINOR)/$(PYTHON).$(PYTHON_SUFFIX) -CROSS_PYTHON := $(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON_MAJORMINOR) +CROSS_PYTHON := $(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare @@ -38,7 +38,7 @@ CROSS_PYTHON := $(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON_MAJORMINOR) PYTHON_PATH := PATH=$(CROSS_PATH) PYTHON_CONF_ENV := \ $(CROSS_ENV) \ - PYTHON_FOR_BUILD=$(PTXCONF_SYSROOT_CROSS)/bin/build-python \ + PYTHON_FOR_BUILD=$(PTXDIST_SYSROOT_CROSS)/bin/build-python \ ac_sys_system=Linux \ ac_sys_release=2 \ MACHDEP=linux2 \ @@ -78,7 +78,7 @@ PYTHON_AUTOCONF := \ --without-ensurepip PYTHON_BUILD_PYTHONPATH := \ - $(PTXCONF_SYSROOT_HOST)/lib/python$(PYTHON_MAJORMINOR)/lib-dynload \ + $(PTXDIST_SYSROOT_HOST)/lib/python$(PYTHON_MAJORMINOR)/lib-dynload \ $(PYTHON_DIR)/build/lib.linux2-$(PTXCONF_ARCH_STRING)-$(PYTHON_MAJORMINOR) \ $(PYTHON_DIR)/Lib \ $(PYTHON_DIR)/Lib/plat-linux2 @@ -86,26 +86,26 @@ PYTHON_BUILD_PYTHONPATH := \ $(STATEDIR)/python.prepare: @$(call targetinfo) - @rm -f $(PTXCONF_SYSROOT_CROSS)/bin/{link,build}-python - @ln -s $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) \ - $(PTXCONF_SYSROOT_CROSS)/bin/link-python - @echo '#!/bin/sh' >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python - @echo '' >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python - @echo '_PYTHON_PROJECT_BASE="$(PYTHON_DIR)"' >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python - @echo '_PYTHON_HOST_PLATFORM=linux2-$(PTXCONF_ARCH_STRING)' >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python + @rm -f $(PTXDIST_SYSROOT_CROSS)/bin/{link,build}-python + @ln -s $(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) \ + $(PTXDIST_SYSROOT_CROSS)/bin/link-python + @echo '#!/bin/sh' >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python + @echo '' >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python + @echo '_PYTHON_PROJECT_BASE="$(PYTHON_DIR)"' >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python + @echo '_PYTHON_HOST_PLATFORM=linux2-$(PTXCONF_ARCH_STRING)' >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python @echo 'PYTHONPATH=$(subst $(space),:,$(PYTHON_BUILD_PYTHONPATH))' \ - >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python + >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python @echo 'export _PYTHON_PROJECT_BASE _PYTHON_HOST_PLATFORM PYTHONPATH' \ - >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python - @echo '' >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python - @echo 'exec $(PTXCONF_SYSROOT_CROSS)/bin/link-python "$${@}"' >> $(PTXCONF_SYSROOT_CROSS)/bin/build-python - @chmod a+x $(PTXCONF_SYSROOT_CROSS)/bin/build-python + >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python + @echo '' >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python + @echo 'exec $(PTXDIST_SYSROOT_CROSS)/bin/link-python "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/bin/build-python + @chmod a+x $(PTXDIST_SYSROOT_CROSS)/bin/build-python @$(call world/prepare, PYTHON) @$(call touch) PYTHON_MAKE_OPT := \ - PGEN_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/pgen + PGEN_FOR_BUILD=$(PTXDIST_SYSROOT_HOST)/bin/pgen # ---------------------------------------------------------------------------- # Install @@ -116,21 +116,21 @@ $(STATEDIR)/python.install: @$(call install, PYTHON) @sed -i \ -e "s:$(SYSROOT):@SYSROOT@:g" \ - -e "s:$(PTXCONF_SYSROOT_HOST):@SYSROOT_HOST@:g" \ + -e "s:$(PTXDIST_SYSROOT_HOST):@SYSROOT_HOST@:g" \ $(PYTHON_PKGDIR)/usr/lib/python$(PYTHON_MAJORMINOR)/config/Makefile @$(call touch) PYTHON_PYTHONPATH := \ $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) \ $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR)/plat-linux2 \ - $(PTXCONF_SYSROOT_HOST)/lib/python$(PYTHON_MAJORMINOR)/lib-dynload \ - $(PTXCONF_SYSROOT_HOST)/lib/python$(PYTHON_MAJORMINOR)/site-packages + $(PTXDIST_SYSROOT_HOST)/lib/python$(PYTHON_MAJORMINOR)/lib-dynload \ + $(PTXDIST_SYSROOT_HOST)/lib/python$(PYTHON_MAJORMINOR)/site-packages $(STATEDIR)/python.install.post: @$(call targetinfo) @sed -i \ -e "s:@SYSROOT@:$(SYSROOT):g" \ - -e "s:@SYSROOT_HOST@:$(PTXCONF_SYSROOT_HOST):g" \ + -e "s:@SYSROOT_HOST@:$(PTXDIST_SYSROOT_HOST):g" \ $(PYTHON_PKGDIR)/usr/lib/python$(PYTHON_MAJORMINOR)/config/Makefile @$(call world/install.post, PYTHON) @@ -142,7 +142,7 @@ $(STATEDIR)/python.install.post: @echo 'PYTHONPATH=$(subst $(space),:,$(PYTHON_PYTHONPATH))' >> "$(CROSS_PYTHON)" @echo 'export _PYTHON_HOST_PLATFORM PYTHONPATH PYTHONHOME' >> "$(CROSS_PYTHON)" @echo '' >> "$(CROSS_PYTHON)" - @echo 'exec $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) "$${@}"' \ + @echo 'exec $(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR) "$${@}"' \ >> "$(CROSS_PYTHON)" @chmod a+x "$(CROSS_PYTHON)" @@ -150,12 +150,12 @@ $(STATEDIR)/python.install.post: > "$(CROSS_PYTHON)-config" @echo "exec \ \"$(CROSS_PYTHON)\" \ - \"$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR)-config\" \ + \"$(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON_MAJORMINOR)-config\" \ \"\$${@}\"" \ >> "$(CROSS_PYTHON)-config" @chmod a+x "$(CROSS_PYTHON)-config" @ln -sf "python$(PYTHON_MAJORMINOR)-config" \ - "$(PTXCONF_SYSROOT_CROSS)/bin/python-config" + "$(PTXDIST_SYSROOT_CROSS)/bin/python-config" @$(call touch) diff --git a/rules/python3-shiboken.make b/rules/python3-shiboken.make index b0f1ea193..8c7d3eaaa 100644 --- a/rules/python3-shiboken.make +++ b/rules/python3-shiboken.make @@ -49,7 +49,7 @@ $(STATEDIR)/python3-shiboken.install: @$(call world/install, PYTHON3_SHIBOKEN) @cd $(PYTHON3_SHIBOKEN_DIR)-build && $(MAKE) -C data install DESTDIR='$(PYTHON3_SHIBOKEN_PKGDIR)' @sed -i -e 's,"$(SYSROOT)/usr,"SYSROOT/usr,g' \ - -e 's,"$(PTXCONF_SYSROOT_CROSS),"SYSROOT_CROSS,g' \ + -e 's,"$(PTXDIST_SYSROOT_CROSS),"SYSROOT_CROSS,g' \ $(PYTHON3_SHIBOKEN_PKGDIR)/usr/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cpython*.cmake @$(call touch) @@ -58,9 +58,9 @@ $(STATEDIR)/python3-shiboken.install.post: @$(call world/install.post, PYTHON3_SHIBOKEN) @sed -i -e 's,(/usr,($(SYSROOT)/usr,g' \ '$(SYSROOT)/usr/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cmake' - @sed -i -e 's,"SYSROOT_CROSS,"@$(PTXCONF_SYSROOT_CROSS),g' \ + @sed -i -e 's,"SYSROOT_CROSS,"@$(PTXDIST_SYSROOT_CROSS),g' \ -e 's,"SYSROOT/usr,"@$(SYSROOT)/usr,g' \ - -e 's,"/usr/bin,"@$(PTXCONF_SYSROOT_HOST)/bin,g' \ + -e 's,"/usr/bin,"@$(PTXDIST_SYSROOT_HOST)/bin,g' \ -e 's,"/usr,"@$(SYSROOT)/usr,g' \ -e 's,"@,",g' \ $(SYSROOT)/usr/lib/cmake/Shiboken-$(PYTHON3_SHIBOKEN_VERSION)/ShibokenConfig.cpython*.cmake diff --git a/rules/python3.make b/rules/python3.make index 713751556..921ac1f80 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -29,7 +29,7 @@ PYTHON3_URL := \ http://python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \ http://python.org/ftp/python/$(PYTHON3_MAJORMINOR)/$(PYTHON3).$(PYTHON3_SUFFIX) -CROSS_PYTHON3 := $(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) +CROSS_PYTHON3 := $(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) # ---------------------------------------------------------------------------- # Prepare @@ -126,11 +126,11 @@ $(STATEDIR)/python3.install.post: @echo 'exec $(HOSTPYTHON3) "$${@}"' >> "$(CROSS_PYTHON3)" @chmod a+x "$(CROSS_PYTHON3)" @ln -sf "python$(PYTHON3_MAJORMINOR)" \ - "$(PTXCONF_SYSROOT_CROSS)/bin/python3" + "$(PTXDIST_SYSROOT_CROSS)/bin/python3" @sed -e 's;prefix_real=.*;prefix_real=$(SYSROOT)/usr;' \ - "$(PTXCONF_SYSROOT_TARGET)/usr/bin/python$(PYTHON3_MAJORMINOR)-config" \ - > "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" - @chmod +x "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" + "$(PTXDIST_SYSROOT_TARGET)/usr/bin/python$(PYTHON3_MAJORMINOR)-config" \ + > "$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" + @chmod +x "$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" # # make sure grammer pickle is generated to avoid parallel building issues @"$(CROSS_PYTHON3)" -c 'from setuptools.command import build_py' @@ -187,8 +187,8 @@ $(STATEDIR)/python3.clean: @$(call clean_pkg, MESA_DEMOS) @rm -vf \ "$(CROSS_PYTHON3)" \ - "$(PTXCONF_SYSROOT_CROSS)/bin/python3" \ - "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" \ + "$(PTXDIST_SYSROOT_CROSS)/bin/python3" \ + "$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config" \ "$(PTXDIST_SYSROOT_CROSS)/lib/python$(PYTHON3_MAJORMINOR)/"_sysconfigdata_m_linux2_*.py # vim: syntax=make diff --git a/rules/shiboken.make b/rules/shiboken.make index 8ef958b73..267b171af 100644 --- a/rules/shiboken.make +++ b/rules/shiboken.make @@ -48,9 +48,9 @@ $(STATEDIR)/shiboken.install: @$(call world/install, SHIBOKEN) @cd $(SHIBOKEN_DIR)-build && $(MAKE) -C data install DESTDIR='$(SHIBOKEN_PKGDIR)' @sed -i -e 's,"$(SYSROOT)/usr,"SYSROOT/usr,g' \ - -e 's,"$(PTXCONF_SYSROOT_CROSS),"SYSROOT_CROSS,g' \ + -e 's,"$(PTXDIST_SYSROOT_CROSS),"SYSROOT_CROSS,g' \ '$(SHIBOKEN_PKGDIR)/usr/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig-python$(PYTHON_MAJORMINOR).cmake' - echo $(PTXCONF_SYSROOT_CROSS)/usr + echo $(PTXDIST_SYSROOT_CROSS)/usr @$(call touch) $(STATEDIR)/shiboken.install.post: @@ -58,9 +58,9 @@ $(STATEDIR)/shiboken.install.post: @$(call world/install.post, SHIBOKEN) @sed -i -e 's,(/usr,($(SYSROOT)/usr,g' \ '$(SYSROOT)/usr/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig.cmake' - @sed -i -e 's,"SYSROOT_CROSS,"$(PTXCONF_SYSROOT_CROSS),g' \ + @sed -i -e 's,"SYSROOT_CROSS,"$(PTXDIST_SYSROOT_CROSS),g' \ -e 's,"SYSROOT/usr,"$(SYSROOT)/usr,g' \ - -e 's,"/usr/bin,"$(PTXCONF_SYSROOT_HOST)/bin,g' \ + -e 's,"/usr/bin,"$(PTXDIST_SYSROOT_HOST)/bin,g' \ -e 's,"/usr,"$(SYSROOT)/usr,g' \ '$(SYSROOT)/usr/lib/cmake/Shiboken-$(SHIBOKEN_VERSION)/ShibokenConfig-python$(PYTHON_MAJORMINOR).cmake' @$(call touch) diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make index 2d91f7f70..5fbd45d56 100644 --- a/rules/usb-modeswitch.make +++ b/rules/usb-modeswitch.make @@ -33,7 +33,7 @@ USB_MODESWITCH_LICENSE := GPL-2.0-only USB_MODESWITCH_CONF_TOOL := NO USB_MODESWITCH_MAKE_ENV := \ $(CROSS_ENV) \ - HOST_TCL=$(PTXCONF_SYSROOT_HOST)/bin/jimsh + HOST_TCL=$(PTXDIST_SYSROOT_HOST)/bin/jimsh USB_MODESWITCH_MAKE_OPT := \ $(CROSS_ENV_PROGS) \ $(call ptx/ifdef,PTXCONF_USB_MODESWITCH_JIM,shared,script) |