diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/meson/Makefile | 7 | ||||
| -rw-r--r-- | package/systemd/Makefile | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/package/meson/Makefile b/package/meson/Makefile index d16d450e0..8799b5463 100644 --- a/package/meson/Makefile +++ b/package/meson/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= meson -PKG_VERSION:= 0.44.0 +PKG_VERSION:= 0.55.3 PKG_RELEASE:= 1 -PKG_HASH:= 5cdbc68c63b5b4a8ee862ab3b6393a2633487ebc9b3e1c3da1091b9c912d1d95 +PKG_HASH:= 2b276df50c5b13ccdbfb14d3333141e9e7985aca31b60400b3f3e0be2ee6897e PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host ninja-host @@ -35,12 +35,13 @@ meson-hostinstall: -e "s%@TARGET_ARCH@%$(ADK_TARGET_ARCH)%g" \ -e "s%@TARGET_CPU@%$(ADK_TARGET_CPU_ARCH)%g" \ -e "s%@TARGET_ENDIAN@%$(ADK_TARGET_ENDIAN)%g" \ - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \ + -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \ -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \ -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \ -e "s%@STAGING_HOST_DIR@%$(STAGING_HOST_DIR)%g" \ $(WRKBUILD)/cross-compilation.conf.in \ > $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf + sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 7ded3c7b6..b0bd4a43e 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= systemd -PKG_VERSION:= 237 +PKG_VERSION:= 246 PKG_RELEASE:= 1 -PKG_HASH:= c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c +PKG_HASH:= 4268bd88037806c61c5cd1c78d869f7f20bf7e7368c63916d47b5d1c3411bd6f PKG_DESCR:= system and service manager PKG_SECTION:= base/init PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod @@ -123,7 +123,7 @@ systemd-install: $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/lib $(CP) $(WRKINST)/usr/lib/*.so* \ $(IDIR_SYSTEMD)/usr/lib - $(CP) $(WRKINST)/usr/lib/{systemd,kernel,udev,sysctl.d,tmpfiles.d} \ + $(CP) $(WRKINST)/usr/lib/{systemd,kernel,sysctl.d,tmpfiles.d} \ $(IDIR_SYSTEMD)/usr/lib $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/bin $(CP) $(WRKINST)/usr/bin/* \ @@ -133,6 +133,6 @@ systemd-install: $(IDIR_SYSTEMD)/usr/share $(CP) ./files/*.network \ $(IDIR_SYSTEMD)/etc/systemd/network - (cd $(IDIR_SYSTEMD)/usr/lib/systemd/system && ln -sf multi-user.target default.target) + #(cd $(IDIR_SYSTEMD)/usr/lib/systemd/system && ln -sf multi-user.target default.target) include $(ADK_TOPDIR)/mk/pkg-bottom.mk |