这是indexloc提供的服务，不要输入任何密码
Skip to content

(fixup) differentiate SRC_NAME from PKG_NAME so it builds #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: squashfs-rename
Choose a base branch
from
Open

(fixup) differentiate SRC_NAME from PKG_NAME so it builds #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/image-commands.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ endef
define Build/append-squashfs-fakeroot-be
rm -rf $@.fakefs $@.fakesquashfs
mkdir $@.fakefs
$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
$(STAGING_DIR_HOST)/bin/mksquashfs3-lzma \
$@.fakefs $@.fakesquashfs \
-noappend -root-owned -be -nopad -b 65536 \
$(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ath79/image/common-netgear.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define Build/netgear-squashfs
rm -rf $@.fs $@.squashfs
mkdir -p $@.fs/image
cp $@ $@.fs/image/uImage
$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
$(STAGING_DIR_HOST)/bin/mksquashfs3-lzma \
$@.fs $@.squashfs -be \
-noappend -root-owned -b 65536 \
$(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
Expand Down
4 changes: 2 additions & 2 deletions tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_LZ4_TOOLS),y) += lz4
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_LZO_TOOLS),y) += lzop
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_TOOLCHAIN),y) += gmp mpc mpfr
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini),y) += genext2fs
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old squashfs
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old squashfs3-lzma
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_mxs),y) += elftosb sdimage
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_realtek),y) += 7z
tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_tegra),y) += cbootimage cbootimage-configs
Expand Down Expand Up @@ -116,7 +116,7 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile
$(curdir)/pkgconf/compile := $(curdir)/meson/compile
$(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile
$(curdir)/sdcc/compile := $(curdir)/bison/compile
$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
$(curdir)/squashfs3-lzma/compile := $(curdir)/lzma-old/compile
$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
$(curdir)/zstd/compile := $(curdir)/meson/compile

Expand Down
21 changes: 13 additions & 8 deletions tools/squashfs/Makefile → tools/squashfs3-lzma/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,21 @@
#
include $(TOPDIR)/rules.mk

PKG_NAME:=squashfs
PKG_NAME:=squashfs3-lzma
PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
PKG_VERSION:=3.0

PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.gz
PKG_SOURCE:=squashfs$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/squashfs
PKG_HASH:=39dbda43cf118536deb746c7730b468702d514a19f4cfab73b710e32908ddf20
PKG_CAT:=zcat

HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
# Tar directory is squashfs3.0 that conflict with any pattern
# currently using for host tools. (PKG_NAME-PKG_VERSION)
# Also this got renamed to a more correct name
# from squashfs to squashfs3-lzma.
# Use tar transform to rename the root directory to this new
# name.
TAR_OPTIONS+=--transform=s/^squashfs/$(PKG_NAME)-/

include $(INCLUDE_DIR)/host-build.mk

Expand All @@ -29,13 +34,13 @@ define Host/Compile
endef

define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma
$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/unsquashfs3-lzma
endef

define Host/Clean
rm -f $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
rm -f $(STAGING_DIR_HOST)/bin/unsquashfs-lzma
rm -f $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma
rm -f $(STAGING_DIR_HOST)/bin/unsquashfs3-lzma
endef

$(eval $(call HostBuild))
0 tools/squashfs/patches/100-lzma.patch → tools/squashfs3-lzma/patches/100-lzma.patch
View file
Open in desktop
File renamed without changes.
0 ...hfs/patches/110-no_nonstatic_inline.patch → ...zma/patches/110-no_nonstatic_inline.patch
View file
Open in desktop
File renamed without changes.
0 ...hes/120-add-fixed-timestamp-support.patch → ...hes/120-add-fixed-timestamp-support.patch
View file
Open in desktop
File renamed without changes.
0 ...ashfs/patches/130-include_sysmacros.patch → ...-lzma/patches/130-include_sysmacros.patch
View file
Open in desktop
File renamed without changes.
0 tools/squashfs/patches/140-gcc-10-fix.patch → ...uashfs3-lzma/patches/140-gcc-10-fix.patch
View file
Open in desktop
File renamed without changes.