diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-13 21:57:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-13 21:57:00 +0200 |
| commit | 025304e3d70b00ea7a91998d80a16e6183a62fad (patch) | |
| tree | f9ba6a65325cb80e1cd9eae3559ab4530e3dfc36 | |
| parent | 2dbe60a5c8d806758609cc499ddbd68437f1fbcc (diff) | |
minor fixes found via allmodconfig configuration
| -rw-r--r-- | package/Pacemaker-Python-GUI/Makefile | 8 | ||||
| -rw-r--r-- | package/feh/Makefile | 5 | ||||
| -rw-r--r-- | package/pacemaker/Makefile | 2 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 11 |
4 files changed, 21 insertions, 5 deletions
diff --git a/package/Pacemaker-Python-GUI/Makefile b/package/Pacemaker-Python-GUI/Makefile index 616fa9360..5a412863e 100644 --- a/package/Pacemaker-Python-GUI/Makefile +++ b/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: diff --git a/package/feh/Makefile b/package/feh/Makefile index 66a86dacb..43a90b8b7 100644 --- a/package/feh/Makefile +++ b/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 diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index 25dc896ff..5d2fe2959 100644 --- a/package/pacemaker/Makefile +++ b/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/ diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 0eeeeaf7c..0bf8f5808 100644 --- a/scripts/scan-pkgs.sh +++ b/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 |