| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
packages
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This patch activates the binconfig_glob mechanism as described in commit
61211865e20efac9042ad89a9a5c28e4bc0d3100.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch introduces a new per package variable ${PKG}_BINCONFIG_GLOB.
By default this variable contains "*-config". As the name suggests it
holds a shell glob pattern, intended to match the per package "-config"
tools.
In a later patch this mechanism is activated, then all files matching
this glob pattern are copied into ${SYSROOT_CROSS}/bin.
This eliminates the need for custom install stages, where these
'*-config' files are copied manually.
For example 'libpng': After a make install we see this in the bin
directory:
$ ll libpng-1.2.42/usr/bin/
total 12K
drwxr-xr-x 2 frogger frogger 4.0K 2010-01-09 11:43 ./
drwxr-xr-x 6 frogger frogger 4.0K 2010-01-09 11:43 ../
-rwxr-xr-x 1 frogger frogger 2.3K 2010-01-09 11:43 libpng12-config*
lrwxrwxrwx 1 frogger frogger 15 2010-01-09 11:43 libpng-config -> libpng12-config*
The default "*-config" matches both files, they are copied automatically
into ${SYSROOT}. Of course these -config files must be SYSROOT ware,
i.e. they must respect the env var SYSROOT and add it e.g. to their prefix.
$ ll sysroot-cross/bin/libpng*
-rwxr-xr-x 1 frogger frogger 2.3K 2010-01-09 15:15 sysroot-cross/bin/libpng12-config*
lrwxrwxrwx 1 frogger frogger 15 2010-01-09 15:15 sysroot-cross/bin/libpng-config -> libpng12-config*
In case a package doesn't want files to be copied it can define the per
package varibale: ${PKG}_BINCONFIG_GLOB := ""
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First this patch moves the ptxdistrc file into '~/.ptxdist/' since my
homedir contains quite a low of .ptxdistrcs now.
Then another variable is introduced:
- PTXDIST_VERSION_PTXRC
which holds the the version for the rc file. It consists for simplicity
reasons of just "$year.$month".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the past ptxdist's fullversion was replaced by configure in these files:
- platforms/ptxdist-version.in.in (PLATFORMCONFIG_VERSION)
- rules/ptxdist-version.in.in (CONFIGFILE_VERSION)
resulting in:
- platforms/ptxdist-version.in
- rules/ptxdist-version.in
However the fullversion is rather dynamic now since it can hold version
information from the version control system. ptxdist refuses to run if
the versions don't match. During development this may change quite
often which is probably too annoying for the developers.
This patch introduces two new version variables:
- PTXDIST_VERSION_CFG_SCM
- PTXDIST_VERSION_CFG_FULL
The _SCM variable holds "-git" if ptxdist isn't release. For released
versions _SCM is empty.
PTXDIST_VERSION_CFG_FULL contains '$year.$month.$bugfix$scm'
(scm is PTXDIST_VERSION_CFG_SCM), for example:
'2010.01.0-git' for modifies i.e. dirty '2010.01.0' release.
Further we don't no longer modify the "*/ptxdist-version.in.in", we use
the kconfig 'option env="VAR"' to get the correct version from the
environment.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The upcomming releases of ptxdist will follow a time based scheme:
ptxdist-xxxx.yy.z
^^^^ ^^ ^----------- Bugfix Number, starting at 0
\ \------------- Month
\---------------- Year
This patch removed the old PTXDIST_VERSION_* variables:
- PTXDIST_VERSION_MAJOR
- PTXDIST_VERSION_MINOR
- PTXDIST_VERSION_MICRO
- PTXDIST_VERSION_EXTRA
and replaces them according to the new scheme with:
- PTXDIST_VERSION_YEAR
- PTXDIST_VERSION_MONTH
- PTXDIST_VERSION_BUGFIX
(For the first release the VERSION_EXTRA will be dropped and may be
added later again)
There is one new variable:
- PTXDIST_VERSION_SCM
holding version information from the version control system
(SCM = Source code Control Management). It's the appendix known from the
linux kernel like '-gb91d1ff-dirty'.
The variable:
- PTXDIST_VERSION_FULL
consists of '$year.$month.$bugfix$scm'. For example:
'2010.01.0-gb91d1ff-dirty'
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
Provide a dummy, no-op version of strip as a lot of makefiles (and install -s)
execute just 'strip' and this leaks in the host version. This approach should
be OK as we do stripping at a later stage anyway and want to keep the
debug-info until then.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch makes the special compiler handling for bootloaders more
generic. To understand what it does, we look at the current status:
There is the config symbol "COMPILER_PREFIX_UBOOT", if its value
differs from the generic "COMPILER_PREFIX"'s value a special compiler
for u-boot is requested.
Currently only u-boot-v2 uses this feature. So if "U_BOOT_V2" is
active we look if ".utoolchain/$(PTXCONF_COMPILER_PREFIX_UBOOT)gcc"
can be found. If not we ask the user to create the link.
The reader might notice that all other configuration links are named
"selected_*" and that this feature is only limited to u-boot-v2.
To make this more generic, this patch first renames "COMPILER_PREFIX_UBOOT"
into "COMPILER_PREFIX_BOOTLOADER", then a new symbol "BOOTLOADER" is
introduced. All bootloaders that support the new sheme should select
"BOOTLOADER". Now a selected "BOOTLOADER" activates the check for the
special toolchain. The link is renamed to
"selected_toolchain_bootloader" to fit the current scheme.
The bootloaders can use the variable "BOOTLOADER_CROSS_COMPILE" which
can be directly passed to kbuild's CROSS_COMPILE.
A migration handler ist added, so the required symbol conversion is done
automatically by "ptxdist migrate".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
| |
This helps people using tab completion a lot.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Jon Ringle <jon@ringle.org>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
Since 96c9beeb, 'ptxdist boardsetup' and 'ptxdist setup' bailed out with
an error message:
ptxdist: error: 'ptxd_kgen' doesn't support 'board, yet
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
pad() wasn't always padding the output file to the correct length. On
some machines dd wasn't reading full blocks which resulted in an
incorrectly padded file. pad() now makes one call to dd to write the
input file using conv=sync to pad to the nearest 512 byte boundry. Then
dd is called again if additional 512 byte '\0' blocks are needed to meet
the padding size.
Signed-off-by: George McCollister <georgem@novatech-llc.com>
Tested-by: George McCollister <georgem@novatech-llc.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
don't run it explizitly before calling ptxd_dgen
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
one for target the other for host and cross pacakges.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
| |
..and introduce the variable: "pkg_sysroot_dir" which points to the
package's sysroot.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
This has been removed and several packages are breaking now.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To generate tag for a certain pacakge, call ptxdist this way:
$ ptxdist tags <package>
PTXdist basically runs:
$ make <PKG>_TAGS_OPT
<PKG>_TAGS_OPT default to "tags", which is a good default for
autotoolizised packages. Of course it can be overwritten on a per
package base, e.g.:
BUSYBOX_TAGS_OPT := tags TAGS scope
Why:
1) non autotool based build system, that has cscope support.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The install stage consists basically of:
make DESTDIR=<PKG>_PKGDIR <PKG>_INSTALL_OPT
With default "install" for <PKG>_INSTALL_OPT.
This can be overwritten or extended from a pacakge. There are
(at least) two reasons for this:
1) "make install" installs too mouch,
you don't want to install everything.
example:
MII_DIAG_INSTALL_OPT := install-mii-diag
2) The package doesn't understand DESTDIR. It uses INSTALL_ROOT instead.
example:
QT4_INSTALL_OPT := INSTALL_ROOT=$(QT4_PKGDIR)
The variable <PKG>_PKGDIR comes predefined from PTXdist and can be
used.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
| |
In the compile stage no agrument is passed to <make>.
Use the variable <PKG>_MAKE_OPT to pass additional arguments.
example:
MII_DIAG_MAKE_OPT := $(CROSS_ENV_CC) mii-diag
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
it's only used for target packages
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
Signed-off-by: Jon Ringle <jon@ringle.org>
[mkl: split into smaller patches, add support for generic extract stage]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
[mkl: add migration helper for long opt option]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch fixes a problem with bash-3.0.x. This old bash versions
doesn't respect IFS when splitting a variable: This costruct doesn't
work:
foo="bar:baz"
local -a qux=( ${foo} )
echo "${foo[@]}"
it prints:
bar:baz
bash > 3.0.x prints
bar baz
The correct sequence is to first declare qux as a local array and then
assign it:
local -a qux
qux=( ${foo} )
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
|
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch cleans up the usage of PKG_CONFIG_LIBDIR and PKG_CONFIG_PATH.
PKG_CONFIG_LIBDIR now points to both "lib/pkgconfig" and
"share/pkgconfig" for both "/" and "/usr" prefixed with all sysroots.
("share/pkgconfig" was missing before).
User defined "PTXCONF_PKG_CONFIG_PATH" are prefixed with the (normal)
sysroot and added to PKG_CONFIG_PATH. Support for production sysroot is
still outstanding.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
| |
Causes "ptxdist menu" -> kernel -> exit to break
Reported-by: Erwin Rol <erwin@erwinrol.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
| |
Until this patch all target packages depent automatically on the
"virtual-cross-tools", which provide fakeroot, pkgconfig and so on.
In order to install certain "target" pacakge before _all_ other target
packages the "BASE" package is introduced.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
| |
Using an array for make's args prevents to let space slip into the args,
which confuses make.
$ ptxdist -k go
make: *** No rule to make target ` -k'. Stop.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
pkg-config-wrapper anymore
pkg-config's .pc file are now relocatable, the pkg-config-wrapper isn't
needed anymore. Thus it's disabled now.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
this gawk script makes pkg-config's pc files relocatable.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|