From 4fcc7439fb4e203f510e133a21e1bf9150b79368 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 3 Nov 2009 21:04:43 +0100 Subject: update X11, kerberos, samba, bluez - fix some ipkg issues with ubuntu - use grub2 for alix1c, no grub1 dependency on host - boots up on alix1c - fix some bcm203x problems --- package/xkeyboard-config/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/xkeyboard-config/Makefile') diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 41f4fa786..710dd1eb6 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 1.6 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 889e6e10eb7449bf33a5423c40369da5 +PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163 PKG_DESCR:= X keyboard config PKG_SECTION:= x11 PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/ @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/xkeyboard-config/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/xkeyboard-config/Makefile') diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 710dd1eb6..cb105a795 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config PKG_VERSION:= 1.7 PKG_RELEASE:= 1 +PKG_BUILDDEP+= xkbcomp PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163 PKG_DESCR:= X keyboard config PKG_SECTION:= x11 -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/xkeyboard-config/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'package/xkeyboard-config/Makefile') diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index cb105a795..7f5f258f4 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -16,13 +16,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - post-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - ${CP} ${WRKINST}/usr/share/X11/xkb/* ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb + ${CP} ${WRKINST}/usr/share/X11/xkb/* \ + ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.lst rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.xml rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr -- cgit v1.2.3