diff options
| -rw-r--r-- | package/e2fsprogs/Makefile | 8 | ||||
| -rw-r--r-- | package/xorg-server/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.pm | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index cd2c3caeb..ac605e2d2 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -17,6 +17,7 @@ PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV +PKG_SUBPKGS+= RESIZE2FS PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs PKGSD_LIBUUID_DEV:= UUID headers @@ -35,6 +36,8 @@ PKGSD_LIBBLKID_DEV:= blkid headers PKGSC_LIBBLKID_DEV:= devel PKGSD_E2FSCK_STATIC:= Static build of e2fsck PKGSC_E2FSCK_STATIC:= fs +PKGSD_RESIZE2FS:= Resize FS utility +PKGSC_RESIZE2FS:= fs include ${TOPDIR}/mk/package.mk @@ -48,6 +51,7 @@ $(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${ $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) $(eval $(call PKG_template,LIBBLKID_DEV,libblkid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID_DEV},${PKGSC_LIBBLKID_DEV})) $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) +$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS})) CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs @@ -78,6 +82,10 @@ e2fsprogs-install: ${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \ ${IDIR_E2FSPROGS}/usr/lib +resize2fs-install: + ${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin + libblkid-install: ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib ${CP} ${WRKINST}/usr/lib/libblkid.so* \ diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index f953d434f..04e6471d5 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -22,6 +22,8 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 PKG_SUBPKGS:= XORG_SERVER XORG_SERVER_DEV +PKGSD_XORG_SERVER_DEV:= Xorg server development files +PKGSC_XORG_SERVER_DEV:= x11/devel PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_ARCH_DEPENDS:= !cris @@ -42,7 +44,7 @@ PKGCB_WITH_CRYPTO:= openssl include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XORG_SERVER_DEV},${PKGSC_XORG_SERVER_DEV})) ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 4e35a12b2..7d7dc1f8f 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -23,7 +23,7 @@ config ADK_KERNEL_ACPI_DOCK boolean menu "Power Management support" -depends on ADK_TARGET_WITH_ACPI +depends on ADK_TARGET_WITH_ACPI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_HARDWARE_ACPI prompt "Enable ACPI support" @@ -52,6 +52,8 @@ config ADK_KERNEL_SUSPEND default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default n help Enable Suspend-to-RAM support. @@ -66,6 +68,8 @@ config ADK_KERNEL_HIBERNATION default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default n help Enable Suspend-to-Disk support. |