diff options
| -rw-r--r-- | patches/atop-1.24/fix-cross-compile.patch (renamed from patches/atop-1.23/fix-cross-compile.patch) | 13 | ||||
| -rw-r--r-- | patches/atop-1.24/series (renamed from patches/atop-1.23/series) | 0 | ||||
| -rw-r--r-- | platforms/hosttools.in | 1 | ||||
| -rw-r--r-- | platforms/kernel.in | 12 | ||||
| -rw-r--r-- | platforms/u-boot.in | 2 | ||||
| -rw-r--r-- | rules/atop.in | 5 | ||||
| -rw-r--r-- | rules/atop.make | 6 | ||||
| -rw-r--r-- | rules/binutils.make | 14 | ||||
| -rw-r--r-- | rules/bzip2.make | 3 | ||||
| -rw-r--r-- | rules/consolekit.in | 15 | ||||
| -rw-r--r-- | rules/consolekit.make | 2 | ||||
| -rw-r--r-- | rules/directfb.in | 12 | ||||
| -rw-r--r-- | rules/eggdbus.make | 8 | ||||
| -rw-r--r-- | rules/hdparm.make | 6 | ||||
| -rw-r--r-- | rules/host-eggdbus.make | 10 | ||||
| -rw-r--r-- | rules/host-ipkg-utils.make | 11 | ||||
| -rw-r--r-- | rules/host-lzop.in | 18 | ||||
| -rw-r--r-- | rules/host-lzop.make | 40 | ||||
| -rw-r--r-- | rules/libcroco.make | 6 | ||||
| -rw-r--r-- | rules/libdrm.make | 5 | ||||
| -rw-r--r-- | rules/libezv24.make | 10 | ||||
| -rw-r--r-- | rules/libjpeg.make | 16 | ||||
| -rw-r--r-- | rules/librsvg.make | 3 | ||||
| -rw-r--r-- | rules/lite.make | 15 | ||||
| -rw-r--r-- | rules/readline.make | 6 |
25 files changed, 143 insertions, 96 deletions
diff --git a/patches/atop-1.23/fix-cross-compile.patch b/patches/atop-1.24/fix-cross-compile.patch index bbb2942ad..e325c7a1e 100644 --- a/patches/atop-1.23/fix-cross-compile.patch +++ b/patches/atop-1.24/fix-cross-compile.patch @@ -9,18 +9,17 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- #20081125: wsa: Mailed to upstream. #20081127: wsa: Accepted upstream. Wait for next release. +#20100317: mkl: Mailed to upstream again. Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: atop-1.23/Makefile -=================================================================== ---- atop-1.23.orig/Makefile -+++ atop-1.23/Makefile -@@ -13,8 +13,8 @@ INIPATH = /etc/rc.d/init.d - CRNPATH = /etc/cron.d +--- a/Makefile ++++ b/Makefile +@@ -15,8 +15,8 @@ CRNPATH = /etc/cron.d ROTPATH = /etc/logrotate.d + # CFLAGS = -g -I. -Wall # -DHTTPSTATS -CFLAGS = -O -I. -Wall # -DHTTPSTATS -LDFLAGS = -lncurses -lm -lz +CFLAGS += -O2 -I. -Wall # -DHTTPSTATS @@ -28,7 +27,7 @@ Index: atop-1.23/Makefile OBJMOD0 = version.o OBJMOD1 = various.o deviate.o procdbase.o OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o -@@ -25,7 +25,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD +@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD all: atop atop: atop.o $(ALLMODS) Makefile diff --git a/patches/atop-1.23/series b/patches/atop-1.24/series index 0190994f9..0190994f9 100644 --- a/patches/atop-1.23/series +++ b/patches/atop-1.24/series diff --git a/platforms/hosttools.in b/platforms/hosttools.in index c8a1fb16d..bb259aac2 100644 --- a/platforms/hosttools.in +++ b/platforms/hosttools.in @@ -12,6 +12,7 @@ source "rules/host-libbz2.in" source "rules/host-libcap.in" source "rules/host-liblzo.in" source "rules/host-libuuid.in" +source "rules/host-lzop.in" source "rules/host-mkelfImage.in" source "rules/host-mtd-utils.in" source "rules/host-squashfs-tools.in" diff --git a/platforms/kernel.in b/platforms/kernel.in index 423fedb8e..2ee8d9984 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -4,6 +4,7 @@ menuconfig KERNEL select IMAGE_KERNEL select HOST_UMKIMAGE if KERNEL_IMAGE_U select HOST_XZ if KERNEL_XZ + select HOST_LZOP if KERNEL_LZOP select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES prompt "Linux kernel " @@ -194,6 +195,17 @@ config KERNEL_XZ Select this if you're unsure, as it won't hurt. It just increases the build time. +config KERNEL_LZOP + prompt "build lzop hosttool" + bool + help + Select this if you're going to build your kernel compressed + with lzo and your host system is lacking the proper tools. + (the "lzop" package) + + Select this if you're unsure, as it won't hurt. It just + increases the build time. + menu "patching & configuration " diff --git a/platforms/u-boot.in b/platforms/u-boot.in index 591f2b164..64d4d03a4 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -26,7 +26,7 @@ config U_BOOT_PROMPT config U_BOOT_SERIES prompt "patch series file" string - default "series${PTXDIST_PLATFORMSUFFIX}" + default "series" help This entry specifies a patch series file which has to live in the kernel patches directory: diff --git a/rules/atop.in b/rules/atop.in index 65aecdcce..3bdeb47b9 100644 --- a/rules/atop.in +++ b/rules/atop.in @@ -1,10 +1,13 @@ ## SECTION=shell_and_console + config ATOP tristate "atop" select ZLIB select NCURSES select LIBC_M help + Monitor for system resources and process activity + Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process @@ -15,5 +18,5 @@ config ATOP CPU utilization, the memory growth, priority, username, state, and exit code. - http://www.atcomputing.nl/Tools/atop + http://www.atoptool.nl/ diff --git a/rules/atop.make b/rules/atop.make index 14c5d20c9..9fb433ecd 100644 --- a/rules/atop.make +++ b/rules/atop.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2008 by Remy Bohmer, Netherlands +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -16,9 +17,9 @@ PACKAGES-$(PTXCONF_ATOP) += atop # # Paths and names # -ATOP_VERSION := 1.23 +ATOP_VERSION := 1.24 ATOP := atop-$(ATOP_VERSION) -ATOP_URL := http://www.atcomputing.nl/Tools/atop/packages/$(ATOP).tar.gz +ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz ATOP_DIR := $(BUILDDIR)/$(ATOP) @@ -35,7 +36,6 @@ $(ATOP_SOURCE): # Prepare # ---------------------------------------------------------------------------- -ATOP_PATH := PATH=$(CROSS_PATH) ATOP_COMPILE_ENV := $(CROSS_ENV) $(STATEDIR)/atop.prepare: diff --git a/rules/binutils.make b/rules/binutils.make index 6c303a8c5..7aedb3f33 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -28,7 +28,6 @@ BINUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/binutils/$(BINUTILS).$(BINUTILS_SUFF BINUTILS_SOURCE := $(SRCDIR)/$(BINUTILS).$(BINUTILS_SUFFIX) BINUTILS_DIR := $(BUILDDIR)/$(BINUTILS) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -41,13 +40,11 @@ $(BINUTILS_SOURCE): # Prepare # ---------------------------------------------------------------------------- -BINUTILS_PATH := PATH=$(CROSS_PATH) -BINUTILS_ENV := $(CROSS_ENV) - # # autoconf # -BINUTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) \ +BINUTILS_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ --target=$(PTXCONF_GNU_TARGET) \ --enable-targets=$(PTXCONF_GNU_TARGET) \ --disable-nls \ @@ -74,17 +71,14 @@ $(STATEDIR)/binutils.targetinstall: ifdef PTXCONF_BINUTILS_READELF @$(call install_copy, binutils, 0, 0, 0755, -, \ - /usr/bin/readelf \ - ) + /usr/bin/readelf) endif ifdef PTXCONF_BINUTILS_OBJDUMP @$(call install_copy, binutils, 0, 0, 0755, -, \ - /usr/bin/objdump \ - ) + /usr/bin/objdump) endif @$(call install_finish, binutils) - @$(call touch) # vim: syntax=make diff --git a/rules/bzip2.make b/rules/bzip2.make index 63d45e82f..a6ac4c356 100644 --- a/rules/bzip2.make +++ b/rules/bzip2.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2009 by Luotao Fu <l.fu@pengutronix.de> +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -55,7 +56,7 @@ $(STATEDIR)/bzip2.targetinstall: @$(call install_fixup, bzip2,DESCRIPTION,missing) ifdef PTXCONF_BZIP2_LIBBZ2 - @$(call install_copy, bzip2, 0, 0, 0755, -, /usr/lib/libbz2.so.1.0.4) + @$(call install_copy, bzip2, 0, 0, 0644, -, /usr/lib/libbz2.so.1.0.4) @$(call install_link, bzip2, libbz2.so.1.0.4, /usr/lib/libbz2.so.1.0) endif diff --git a/rules/consolekit.in b/rules/consolekit.in index 27df5d4e2..b0aefc60d 100644 --- a/rules/consolekit.in +++ b/rules/consolekit.in @@ -3,5 +3,18 @@ config CONSOLEKIT tristate prompt "ConsoleKit" + select DBUS_GLIB + select GLIB + select ZLIB + select POLKIT help - FIXME + framework for defining and tracking users, sessions and seats + + ConsoleKit is a system daemon for tracking what users are + logged into the system and how they interact with the + computer (e.g. which keyboard and mouse they use). + + It provides asynchronous notification via the system message + bus. + + Homepage: http://www.freedesktop.org/wiki/Software/ConsoleKit diff --git a/rules/consolekit.make b/rules/consolekit.make index e591e238e..2c83eceb4 100644 --- a/rules/consolekit.make +++ b/rules/consolekit.make @@ -91,7 +91,7 @@ $(STATEDIR)/consolekit.targetinstall: @$(call install_copy, consolekit, 0, 0, 0755, -, \ /usr/lib/ConsoleKit/scripts/ck-system-stop) - @$(call install_copy, consolekit, 0, 0, 0755, -, \ + @$(call install_copy, consolekit, 0, 0, 0644, -, \ /usr/lib/libck-connector.so.0.0.0) @$(call install_link, consolekit, libck-connector.so.0.0.0, \ /usr/lib/libck-connector.so.0) diff --git a/rules/directfb.in b/rules/directfb.in index 9a9fde6c7..2fee80f89 100644 --- a/rules/directfb.in +++ b/rules/directfb.in @@ -6,12 +6,12 @@ menuconfig DIRECTFB select HOST_DIRECTFB select MENU_XORG_FONTS - select LIBPNG if DIRECTFB_IMAGE_PNG - select LIBJPEG if DIRECTFB_IMAGE_JPEG - select FREETYPE if DIRECTFB_FONT_FREETYPE - select TSLIB if DIRECTFB_INPUT_TSLIB - select XORG_LIB_X11 if DIRECTFB_X11 - select MESALIB if DIRECTFB_GFX_GL + select LIBPNG if DIRECTFB_IMAGE_PNG + select LIBJPEG if DIRECTFB_IMAGE_JPEG + select FREETYPE if DIRECTFB_FONT_FREETYPE + select TSLIB if DIRECTFB_INPUT_TSLIB + select XORG_LIB_X11 if DIRECTFB_X11 + select MESALIB if DIRECTFB_GFX_GL help DirectFB is a thin library that provides hardware graphics acceleration, input device handling and diff --git a/rules/eggdbus.make b/rules/eggdbus.make index 090e5cf51..fc89044a5 100644 --- a/rules/eggdbus.make +++ b/rules/eggdbus.make @@ -36,10 +36,7 @@ $(EGGDBUS_SOURCE): # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# -EGGDBUS_AUTOCONF = \ +EGGDBUS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --enable-largefile \ --disable-ansi \ @@ -68,9 +65,6 @@ $(STATEDIR)/eggdbus.targetinstall: @$(call install_link, eggdbus, libeggdbus-1.so.0.0.0, /usr/lib/libeggdbus-1.so.0) @$(call install_link, eggdbus, libeggdbus-1.so.0.0.0, /usr/lib/libeggdbus-1.so) - #/usr/bin/eggdbus-glib-genmarshal - #/usr/bin/eggdbus-binding-tool - @$(call install_finish, eggdbus) @$(call touch) diff --git a/rules/hdparm.make b/rules/hdparm.make index ee6ed3ab6..6f35676aa 100644 --- a/rules/hdparm.make +++ b/rules/hdparm.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_HDPARM) += hdparm # # Paths and names # -HDPARM_VERSION := 9.10 +HDPARM_VERSION := 9.28 HDPARM := hdparm-$(HDPARM_VERSION) HDPARM_SUFFIX := tar.gz HDPARM_URL := $(PTXCONF_SETUP_SFMIRROR)/hdparm/$(HDPARM).$(HDPARM_SUFFIX) @@ -37,8 +37,8 @@ $(HDPARM_SOURCE): # Compile # ---------------------------------------------------------------------------- -HDPARM_PATH := PATH=$(CROSS_PATH) -HDPARM_MAKE_ENV := $(CROSS_ENV) +HDPARM_CONF_TOOL := NO +HDPARM_MAKE_ENV := $(CROSS_ENV) # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/host-eggdbus.make b/rules/host-eggdbus.make index 8e6551350..6a13734fd 100644 --- a/rules/host-eggdbus.make +++ b/rules/host-eggdbus.make @@ -18,9 +18,11 @@ HOST_PACKAGES-$(PTXCONF_HOST_EGGDBUS) += host-eggdbus # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# -HOST_EGGDBUS_CONF_TOOL := autoconf +HOST_EGGDBUS_AUTOCONF := \ + $(HOST_AUTOCONF) \ + --disable-man-pages \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf # vim: syntax=make diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index 63eb4e20e..44eb209b1 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2005 by Robert Schwebel +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -35,12 +36,8 @@ $(HOST_IPKG_UTILS_SOURCE): # Prepare # ---------------------------------------------------------------------------- -HOST_IPKG_UTILS_PATH := PATH=$(HOST_PATH) -HOST_IPKG_UTILS_ENV := $(HOST_ENV) -HOST_IPKG_UTILS_MAKEVARS := PREFIX=$(PTXCONF_SYSROOT_HOST) - -$(STATEDIR)/host-ipkg-utils.prepare: - @$(call targetinfo) - @$(call touch) +HOST_IPKG_UTILS_CONF_TOOL := NO +HOST_IPKG_UTILS_MAKE_OPT := PREFIX=$(PTXCONF_SYSROOT_HOST) $(HOST_ENV_CC) +HOST_IPKG_UTILS_INSTALL_OPT := $(HOST_IPKG_UTILS_MAKE_OPT) install # vim: syntax=make diff --git a/rules/host-lzop.in b/rules/host-lzop.in new file mode 100644 index 000000000..cab61ec84 --- /dev/null +++ b/rules/host-lzop.in @@ -0,0 +1,18 @@ +## SECTION=hosttools_noprompt + +config HOST_LZOP + tristate + select HOST_LIBLZO + help + fast compression program + + lzop is a compressor similar to gzip. Its main advantages + over gzip are much higher compression and decompression + speed. lzop was designed with the following goals in mind: + + 1) reliability + 2) speed (both compression and decompression) + 3) reasonable drop-in compatibility with gzip + 4) portability + + Homepage: http://www.lzop.org/ diff --git a/rules/host-lzop.make b/rules/host-lzop.make new file mode 100644 index 000000000..fc27a64c9 --- /dev/null +++ b/rules/host-lzop.make @@ -0,0 +1,40 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LZOP) += host-lzop + +# +# Paths and names +# +HOST_LZOP_VERSION := 1.02rc1 +HOST_LZOP := lzop-$(HOST_LZOP_VERSION) +HOST_LZOP_SUFFIX := tar.gz +HOST_LZOP_URL := http://www.lzop.org/download/$(HOST_LZOP).$(HOST_LZOP_SUFFIX) +HOST_LZOP_SOURCE := $(SRCDIR)/$(HOST_LZOP).$(HOST_LZOP_SUFFIX) +HOST_LZOP_DIR := $(HOST_BUILDDIR)/$(HOST_LZOP) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +$(HOST_LZOP_SOURCE): + @$(call targetinfo) + @$(call get, HOST_LZOP) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +HOST_LZOP_CONF_TOOL := autoconf + +# vim: syntax=make diff --git a/rules/libcroco.make b/rules/libcroco.make index 4da760b3e..69a96db35 100644 --- a/rules/libcroco.make +++ b/rules/libcroco.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2009 by Erwin Rol +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -35,9 +36,6 @@ $(LIBCROCO_SOURCE): # Prepare # ---------------------------------------------------------------------------- -LIBCROCO_PATH := PATH=$(CROSS_PATH) -LIBCROCO_ENV := $(CROSS_ENV) - # # autoconf # @@ -67,7 +65,7 @@ $(STATEDIR)/libcroco.targetinstall: @$(call install_fixup, libcroco,DEPENDS,) @$(call install_fixup, libcroco,DESCRIPTION,missing) - @$(call install_copy, libcroco, 0, 0, 0755, -, \ + @$(call install_copy, libcroco, 0, 0, 0644, -, \ /usr/lib/libcroco-0.6.so.3.0.1) @$(call install_link, libcroco, libcroco-0.6.so.3.0.1, \ /usr/lib/libcroco-0.6.so.3) diff --git a/rules/libdrm.make b/rules/libdrm.make index 0480ad53b..22cd411d3 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -65,15 +65,14 @@ $(STATEDIR)/libdrm.targetinstall: @$(call install_fixup, libdrm,DEPENDS,) @$(call install_fixup, libdrm,DESCRIPTION,missing) - @$(call install_copy, libdrm, 0, 0, 0755, -, \ + @$(call install_copy, libdrm, 0, 0, 0644, -, \ /usr/lib/libdrm.so.2.4.0) - @$(call install_link, libdrm, libdrm.so.2.4.0, /usr/lib/libdrm.so.2) @$(call install_link, libdrm, libdrm.so.2.4.0, /usr/lib/libdrm.so) ifndef PTXCONF_ARCH_ARM ifdef PTXCONF_LIBDRM_INTEL - @$(call install_copy, libdrm, 0, 0, 0755, -, \ + @$(call install_copy, libdrm, 0, 0, 0644, -, \ /usr/lib/libdrm_intel.so.1.0.0) @$(call install_link, libdrm, libdrm_intel.so.1.0.0, /usr/lib/libdrm_intel.so.1) diff --git a/rules/libezv24.make b/rules/libezv24.make index bdb7b5438..4090d901d 100644 --- a/rules/libezv24.make +++ b/rules/libezv24.make @@ -37,13 +37,7 @@ $(LIBEZV24_SOURCE): # Prepare # ---------------------------------------------------------------------------- -LIBEZV24_PATH := PATH=$(CROSS_PATH) -LIBEZV24_ENV := $(CROSS_ENV) - -# -# autoconf -# -LIBEZV24_AUTOCONF := $(CROSS_AUTOCONF_USR) +LIBEZV24_CONF_TOOL := autoconf # ---------------------------------------------------------------------------- # Target-Install @@ -61,7 +55,7 @@ $(STATEDIR)/libezv24.targetinstall: @$(call install_fixup,libezv24,DEPENDS,) @$(call install_fixup,libezv24,DESCRIPTION,missing) - @$(call install_copy, libezv24, 0, 0, 0755, -, \ + @$(call install_copy, libezv24, 0, 0, 0644, -, \ /usr/lib/libezV24.so.0.0.0) @$(call install_link, libezv24, \ diff --git a/rules/libjpeg.make b/rules/libjpeg.make index 5c02e7dce..d26c14da6 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg # # Paths and names # -LIBJPEG_VERSION := 8 +LIBJPEG_VERSION := 8a LIBJPEG_SUFFIX := tar.gz LIBJPEG := jpeg-$(LIBJPEG_VERSION) LIBJPEG_TARBALL := jpegsrc.v$(LIBJPEG_VERSION).$(LIBJPEG_SUFFIX) @@ -38,13 +38,7 @@ $(LIBJPEG_SOURCE): # Prepare # ---------------------------------------------------------------------------- -LIBJPEG_PATH := PATH=$(CROSS_PATH) -LIBJPEG_ENV := $(CROSS_ENV) - -# -# autoconf -# -LIBJPEG_AUTOCONF := $(CROSS_AUTOCONF_USR) +LIBJPEG_CONF_TOOL := autoconf # ---------------------------------------------------------------------------- # Target-Install @@ -63,9 +57,9 @@ $(STATEDIR)/libjpeg.targetinstall: @$(call install_fixup, libjpeg,DESCRIPTION,missing) @$(call install_copy, libjpeg, 0, 0, 0644, -, \ - /usr/lib/libjpeg.so.8.0.0) - @$(call install_link, libjpeg, libjpeg.so.8.0.0, /usr/lib/libjpeg.so.8) - @$(call install_link, libjpeg, libjpeg.so.8.0.0, /usr/lib/libjpeg.so) + /usr/lib/libjpeg.so.8.0.1) + @$(call install_link, libjpeg, libjpeg.so.8.0.1, /usr/lib/libjpeg.so.8) + @$(call install_link, libjpeg, libjpeg.so.8.0.1, /usr/lib/libjpeg.so) @$(call install_finish, libjpeg) diff --git a/rules/librsvg.make b/rules/librsvg.make index 02efb9f15..a29fb00b6 100644 --- a/rules/librsvg.make +++ b/rules/librsvg.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2009 by Erwin Rol +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -82,7 +83,7 @@ $(STATEDIR)/librsvg.targetinstall: @$(call install_fixup, librsvg,DEPENDS,) @$(call install_fixup, librsvg,DESCRIPTION,missing) - @$(call install_copy, librsvg, 0, 0, 0755, -, \ + @$(call install_copy, librsvg, 0, 0, 0644, -, \ /usr/lib/librsvg-2.so.2.26.0) @$(call install_link, librsvg, librsvg-2.so.2.26.0, \ /usr/lib/librsvg-2.so.2) diff --git a/rules/lite.make b/rules/lite.make index d91184eb1..c7558da84 100644 --- a/rules/lite.make +++ b/rules/lite.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2007 by Denis Oliver Kropp +# 2010 by Marc Kleine-Budde <mkl@penugtronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -35,13 +36,7 @@ $(LITE_SOURCE): # Prepare # ---------------------------------------------------------------------------- -LITE_PATH := PATH=$(CROSS_PATH) -LITE_ENV := $(CROSS_ENV) - -# -# autoconf -# -LITE_AUTOCONF := $(CROSS_AUTOCONF_USR) +LITE_CONF_TOOL := autoconf # ---------------------------------------------------------------------------- # Target-Install @@ -59,14 +54,12 @@ $(STATEDIR)/lite.targetinstall: @$(call install_fixup, lite,DEPENDS,) @$(call install_fixup, lite,DESCRIPTION,missing) - @$(call install_copy, lite, 0, 0, 0755, -, \ + @$(call install_copy, lite, 0, 0, 0644, -, \ /usr/lib/liblite.so.3.0.5) - @$(call install_link, lite, liblite.so.3.0.5, /usr/lib/liblite.so.3) - @$(call install_copy, lite, 0, 0, 0755, -, \ + @$(call install_copy, lite, 0, 0, 0644, -, \ /usr/lib/libleck.so.3.0.5) - @$(call install_link, lite, libleck.so.3.0.5, /usr/lib/libleck.so.3) @$(call install_copy, lite, 0, 0, 0644, -, \ diff --git a/rules/readline.make b/rules/readline.make index 7c92253f8..1eeb5f527 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -36,12 +36,6 @@ $(READLINE_SOURCE): # Prepare # ---------------------------------------------------------------------------- -READLINE_PATH := PATH=$(CROSS_PATH) -READLINE_ENV := $(CROSS_ENV) - -# -# autoconf -# READLINE_AUTOCONF := \ $(CROSS_AUTOCONF_ROOT) \ --enable-shared \ |