diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-10 21:44:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-10 21:44:14 +0200 |
| commit | a1eafbfc0077cd7074961e635ca2387ada7da440 (patch) | |
| tree | 2249afab84280f8cffd43639afa2708c23505a3e | |
| parent | 123ac5fa80c94080c531fb4bf69d7eff6db1f4d0 (diff) | |
| parent | ebbb7f7e7edd29ddcfede17b8bc4300ff481c10e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/ImageMagick/Makefile | 3 | ||||
| -rwxr-xr-x | package/base-files/src/sbin/adkupdate | 8 | ||||
| -rw-r--r-- | target/config/Config.in | 2 | ||||
| -rw-r--r-- | target/packages/pkg-available/laptop | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 46abb9280..2f50ddf20 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -24,7 +24,7 @@ PKGSC_CONVERT:= multimedia PKGSS_CONVERT:= libimagemagick PKGSD_DISPLAY:= image display application PKGSC_DISPLAY:= multimedia -PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng +PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl PKGSB_DISPLAY:= libX11 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz @@ -36,7 +36,6 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=yes CONFIGURE_ARGS+= --with-magick-plus-plus=no \ diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate index 619faf04f..b5477412f 100755 --- a/package/base-files/src/sbin/adkupdate +++ b/package/base-files/src/sbin/adkupdate @@ -89,6 +89,14 @@ case $1 in ;; esac +# fix permissions +if [ -f /usr/bin/sudo ];then + chmod 4755 /usr/bin/sudo +fi +if [ -f /usr/bin/Xorg ];then + chmod 4755 /usr/bin/Xorg +fi + sync if [ -x /sbin/cfgfs ];then umount /etc diff --git a/target/config/Config.in b/target/config/Config.in index ab651028f..36cad132f 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -371,7 +371,7 @@ config ADK_TARGET_CFLAGS default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 - default "-march=loongson2f" if ADK_CPU_LOONGSON2F + default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F default "-march=mips32" if ADK_CPU_MIPS32 default "-march=mips64" if ADK_CPU_MIPS64 default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5 diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop index 79e701127..0193703de 100644 --- a/target/packages/pkg-available/laptop +++ b/target/packages/pkg-available/laptop @@ -24,6 +24,7 @@ config ADK_PKG_LAPTOP select ADK_PACKAGE_FEH select ADK_PACKAGE_XINIT select ADK_PACKAGE_EVILWM + select ADK_PACKAGE_XRDB select ADK_PACKAGE_FIREFOX select ADK_PACKAGE_DILLO select ADK_PACKAGE_MPLAYER |