Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 14 năm trước cách đây
mục cha
commit
82fe4e6759

+ 1 - 1
package/grep/Makefile

@@ -24,6 +24,6 @@ CONFIGURE_ARGS+=	--without-included-regex
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_GREP)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/?grep $(IDIR_GREP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 26 - 0
package/lxmenu-data/Makefile

@@ -0,0 +1,26 @@
+# 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:=		lxmenu-data
+PKG_VERSION:=		0.1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		75b7fee16ef05e96b7ce3607eee3cc93
+PKG_DESCR:=		LXDE menu data
+PKG_SECTION:=		x11/lxde
+PKG_URL:=		http://lxde.org/
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LXMENU_DATA,lxmenu-data,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+lxde-common-install:
+	$(INSTALL_DIR) $(IDIR_LXMENU_DATA)/etc/xdg
+	$(CP) $(WRKINST)/etc/xdg/* $(IDIR_LXMENU_DATA)/etc/xdg
+	$(INSTALL_DIR) $(IDIR_LXMENU_DATA)/usr/share/desktop-directories
+	$(CP) $(WRKINST)/usr/share/desktop-directories/* \
+		$(IDIR_LXMENU_DATA)/usr/share/desktop-directories
+
+include ${TOPDIR}/mk/pkg-bottom.mk

+ 1 - 0
target/arm/sys-available/acmesystems-foxg20

@@ -1,6 +1,7 @@
 config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	bool "Foxboard FOXG20"
 	select ADK_arm
+	select ADK_little
 	select ADK_acmesystems_foxg20
 	select ADK_KERNEL_ARCH_AT91
 	select ADK_KERNEL_ARCH_AT91SAM9G20

+ 1 - 1
target/config/Config.in

@@ -17,7 +17,7 @@ source "target/config/Config.in.system"
 
 choice
 prompt "Target Endianess"
-depends on ADK_LINUX_ARM || ADK_LINUX_MIPS && ADK_TOOLCHAIN_ONLY
+depends on (ADK_LINUX_ARM || ADK_LINUX_MIPS) && ADK_TOOLCHAIN_ONLY
 config ADK_ENDIAN
         boolean "Choose target endianess"