Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8261 from neheb/bt

Browse source 
btrfs-progs: Several fixes
This commit is contained in:
Hannu Nyman 2019-02-20 22:39:57 +02:00 committed by GitHub
commit aae108f3c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
utils/btrfs-progs/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=btrfs-progs PKG_NAME:=btrfs-progs
PKG_VERSION:=4.20.1 PKG_VERSION:=4.20.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs
@ -41,7 +41,12 @@ define Package/btrfs-progs/description
endef endef
progs = btrfs btrfs-find-root btrfs-image btrfs-map-logical \ progs = btrfs btrfs-find-root btrfs-image btrfs-map-logical \
btrfs-select-super btrfstune fsck.btrfs mkfs.btrfs btrfs-select-super btrfstune mkfs.btrfs
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections -Wl,--as-needed
EXTRA_CFLAGS=$(TARGET_CPPFLAGS)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-backtrace \ --disable-backtrace \
@ -50,24 +55,16 @@ CONFIGURE_ARGS += \
--disable-python \ --disable-python \
--disable-zstd --disable-zstd
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
TARGET_LDFLAGS += -Wl,--gc-sections -flto
EXTRA_CFLAGS=$(TARGET_CPPFLAGS)
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
$(CP) \ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(PKG_INSTALL_DIR)/usr/include/* \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbtrfs* $(1)/usr/lib/
$(1)/usr/include/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libbtrfs.{a,so*} \
$(1)/usr/lib/
endef endef
define Package/btrfs-progs/install define Package/btrfs-progs/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libbtrfs.so* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbtrfs.so* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbtrfsutil.so* $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(addprefix $(PKG_INSTALL_DIR)/usr/bin/, $(progs)) $(1)/usr/bin/ $(INSTALL_BIN) $(addprefix $(PKG_INSTALL_DIR)/usr/bin/, $(progs)) $(1)/usr/bin/
$(LN) btrfs $(1)/usr/bin/btrfsck $(LN) btrfs $(1)/usr/bin/btrfsck