Browse Source

minor fixes found via allmodconfig configuration

Waldemar Brodkorb 13 years ago
parent
commit
025304e3d7
4 changed files with 21 additions and 5 deletions
  1. 7 1
      package/Pacemaker-Python-GUI/Makefile
  2. 2 3
      package/feh/Makefile
  3. 1 1
      package/pacemaker/Makefile
  4. 11 0
      scripts/scan-pkgs.sh

+ 7 - 1
package/Pacemaker-Python-GUI/Makefile

@@ -13,6 +13,9 @@ PKG_BUILDDEP:=		pacemaker gnutls pam
 PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_CFLINE_PACEMAKER_PYTHON_GUI:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_CFLINE_PACEMAKER_MGMTD:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
 PKG_SUBPKGS:=		PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD
 PKGSD_PACEMAKER_MGMTD:=	Management daemon for Pacemaker GUI
 
@@ -31,9 +34,12 @@ TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/python2.7 \
 pacemaker-python-gui-install:
 	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
 	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui
 	$(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \
 		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/hb_gui \
+	$(CP) $(WRKINST)/usr/share/heartbeat-gui/* \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui
+	$(CP) $(WRKINST)/usr/bin/*_gui \
 		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
 
 pacemaker-mgmtd-install:

+ 2 - 3
package/feh/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1bb080c7b0021db50884a52161251990
 PKG_DESCR:=		image viewer
 PKG_SECTION:=		multimedia
+PKG_BUILDDEP:=		imlib2 giblib libXt
 PKG_DEPENDS:=		imlib2 giblib
-PKG_BUILDDEP:=		imlib2 giblib
 PKG_SITES:=		http://feh.finalrewind.org/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -25,7 +25,6 @@ MAKE_FLAGS+=		curl=0 xinerama=0
 
 feh-install:
 	$(INSTALL_DIR) $(IDIR_FEH)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/feh \
-		$(IDIR_FEH)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/feh $(IDIR_FEH)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 1 - 1
package/pacemaker/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		bfe2127d31e5244d0106a5c290fd0dc2
 PKG_DESCR:=		scalable High-Availability cluster resource manager
 PKG_SECTION:=		ha
-PKG_BUILDDEP:=		resource-agents cluster-glue pam gnutls
+PKG_BUILDDEP:=		resource-agents cluster-glue pam gnutls corosync
 PKG_DEPENDS:=		python2 python2-readline python2-bzip2 cluster-glue
 PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2
 PKG_URL:=		http://www.clusterlabs.org/

+ 11 - 0
scripts/scan-pkgs.sh

@@ -133,6 +133,10 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
+if [[ -n $ADK_PACKAGE_PACEMAKER_MGMTD ]]; then
+	NEED_SWIG="$NEED_SWIG pacemaker-mgmtd"
+fi
+
 if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
 	NEED_GPERF="$NEED_GPERF eglibc"
 fi
@@ -313,6 +317,13 @@ if [[ -n $NEED_LIBIDL ]]; then
 	fi
 fi
 
+if [[ -n $NEED_SWIG ]]; then
+	if ! which swig >/dev/null 2>&1; then
+		echo >&2 You need swig to build $NEED_SWIG
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_GPERF ]]; then
 	if ! which gperf >/dev/null 2>&1; then
 		echo >&2 You need gperf to build $NEED_GPERF