From 7d768fd32415a15d0e3c87aa4cab0b1bafda2fda Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Jan 2010 14:46:05 +0100 Subject: add xf86 mouse and keyboard support got patch from joerg seitter. slightly modified. runtime testing done by joerg. --- package/Config.in | 2 ++ package/xf86-input-keyboard/Makefile | 32 ++++++++++++++++++++++++++++++++ package/xf86-input-mouse/Makefile | 31 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 package/xf86-input-keyboard/Makefile create mode 100644 package/xf86-input-mouse/Makefile diff --git a/package/Config.in b/package/Config.in index 1806589fc..74d7c2696 100644 --- a/package/Config.in +++ b/package/Config.in @@ -531,6 +531,8 @@ menu "X" source "package/xorg-server/Config.in" source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" +source "package/xf86-input-mouse/Config.in" +source "package/xf86-input-keyboard/Config.in" menu "X Libraries" source "package/libICE/Config.in" diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile new file mode 100644 index 000000000..062624fdc --- /dev/null +++ b/package/xf86-input-keyboard/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xf86-input-keyboard +PKG_VERSION:= 1.4.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fc836be5364d80604cb11f4daacceb23 +PKG_DESCR:= X11 driver for keyboard +PKG_SECTION:= x11 +PKG_BUILDDEP+= xorg-server +PKG_DEPENDS:= xorg-server +PKG_SITES:= ${MASTER_SITE_XORG} + +PKG_TARGET_DEPENDS:= alix1c + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,${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_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/kbd_drv.so \ + ${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input/ + +include ${TOPDIR}/mk/pkg-bottom.mk + diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile new file mode 100644 index 000000000..093f1bec8 --- /dev/null +++ b/package/xf86-input-mouse/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xf86-input-mouse +PKG_VERSION:= 1.5.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a662883fd9709c3dad7fb113ad8d2908 +PKG_DESCR:= X11 driver for mouse +PKG_SECTION:= x11 +PKG_DEPENDS:= xorg-server +PKG_BUILDDEP+= xorg-server +PKG_SITES:= ${MASTER_SITE_XORG} + +PKG_TARGET_DEPENDS:= alix1c + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_MOUSE,${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_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/mouse_drv.so \ + ${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input/ + +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From e6d7923746537504a5e19b5c9aa050a1836048b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Jan 2010 14:46:58 +0100 Subject: move package template out of pkgmaker's view avoid pkgmaker warning. quagga is a multi package. --- mk/build.mk | 14 +++++++------- package/.template/Makefile | 34 ++++++++++++++++++++++++++++++++++ package/quagga/Makefile | 1 + package/template/Makefile | 34 ---------------------------------- target/bulk.lst | 2 -- 5 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 package/.template/Makefile delete mode 100644 package/template/Makefile diff --git a/mk/build.mk b/mk/build.mk index 495077b3a..ee3867a16 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -178,10 +178,10 @@ kernelconfig: $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config -# create a new package from package/template +# create a new package from package/.template newpackage: @echo "Creating new package $(PKG)" - $(CP) $(TOPDIR)/package/template $(TOPDIR)/package/$(PKG) + $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG) pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'); \ $(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile @@ -403,17 +403,17 @@ bulk: mkdir -p $(TOPDIR)/bulkdir/$$target-$$libc-$$fs; \ ( \ echo === building $$target $$libc $$fs on $$(date); \ - $(MAKE) prereq && \ + $(GMAKE) prereq && \ if [ "x$$p" = xy ];then \ - $(MAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ allmodconfig; \ else \ - $(MAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ defconfig; \ fi && \ - $(MAKE) VERBOSE=1 -f mk/build.mk allcopy \ + $(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \ targetdir=$$target-$$libc-$$fs; \ - $(MAKE) cleantarget; \ + $(GMAKE) cleantarget; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \ done <${TOPDIR}/target/bulk.lst diff --git a/package/.template/Makefile b/package/.template/Makefile new file mode 100644 index 000000000..66064ce81 --- /dev/null +++ b/package/.template/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= @PKG@ +PKG_VERSION:= @VER@ +PKG_RELEASE:= 1 +PKG_MD5SUM:= @add md5sum of package here@ +PKG_DESCR:= @add short description@ +PKG_SECTION:= @add section@ +PKG_DEPENDS:= @add dependendant package names@ +PKG_URL:= @add project url@ +PKG_SITES:= @add download url without package name@ + +# if downloaded package is not ending with .tar.gz use following +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +# use following to add ./configure options +#CONFIGURE_ARGS+= --disable-foo +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +# please install all files and directories to the package dir +post-install: + $(INSTALL_DIR) $(IDIR_@UPKG@)/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ $(IDIR_@UPKG@)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/quagga/Makefile b/package/quagga/Makefile index aec761417..b5985255d 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -10,6 +10,7 @@ PKG_BUILDDEP+= readline ncurses PKG_MD5SUM:= 8975414c76a295f4855a417af0b5ddce PKG_DESCR:= A routing software package PKG_SECTION:= net +PKG_MULTI:= 1 PKG_URL:= http://www.quagga.net PKG_SITES:= http://www.quagga.net/download/ \ http://www.de.quagga.net/download/ \ diff --git a/package/template/Makefile b/package/template/Makefile deleted file mode 100644 index 66064ce81..000000000 --- a/package/template/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= @PKG@ -PKG_VERSION:= @VER@ -PKG_RELEASE:= 1 -PKG_MD5SUM:= @add md5sum of package here@ -PKG_DESCR:= @add short description@ -PKG_SECTION:= @add section@ -PKG_DEPENDS:= @add dependendant package names@ -PKG_URL:= @add project url@ -PKG_SITES:= @add download url without package name@ - -# if downloaded package is not ending with .tar.gz use following -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_STYLE:= gnu -# use following to add ./configure options -#CONFIGURE_ARGS+= --disable-foo -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - -# please install all files and directories to the package dir -post-install: - $(INSTALL_DIR) $(IDIR_@UPKG@)/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ $(IDIR_@UPKG@)/usr/bin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/target/bulk.lst b/target/bulk.lst index ab34a4697..8017bf310 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -1,3 +1 @@ -alix1c uclibc nfsroot y -alix1c eglibc nfsroot y alix1c glibc nfsroot y -- cgit v1.2.3