Commit cebf9798 authored by Alexander Larsson's avatar Alexander Larsson
Browse files

Fix the %dist support

parent 4ad37ea8
......@@ -60,16 +60,16 @@ rpm-dependencies.P: $(ALL_SPECS) makedeps.sh $(IMAGES)/gnomeos-contents-sdk-$(AR
./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
./build.sh ./makedeps.sh $(ALL_SPECS) > rpm-dependencies.P
gnome-sdk.tar.gz gnome-sdk-rpmdb.tar.gz: $(NOARCH)/gnome-sdk-0.1-1.noarch.rpm
gnome-sdk.tar.gz gnome-sdk-rpmdb.tar.gz: $(NOARCH)/gnome-sdk-0.1-1.sdk.noarch.rpm
./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
./build.sh smart install -y $(NOARCH)/gnome-sdk-0.1-1.noarch.rpm
./build.sh smart install -y $(NOARCH)/gnome-sdk-0.1-1.sdk.noarch.rpm
rm -rf gnome-sdk.tar.gz
tar --transform 's,^root/usr,files,S' -czf gnome-sdk.tar.gz root/usr --owner=root
tar --transform 's,^var,files,S' -czf gnome-sdk-rpmdb.tar.gz var/lib/rpm --owner=root
gnome-platform-base: $(NOARCH)/gnome-platform-base-0.1-1.noarch.rpm
gnome-platform-base: $(NOARCH)/gnome-platform-base-0.1-1.sdk.noarch.rpm
$(NOARCH)/gnome-platform-base-0.1-1.noarch.rpm: $(SPECS)/gnome-platform-base.spec setup.sh build.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
$(NOARCH)/gnome-platform-base-0.1-1.sdk.noarch.rpm: $(SPECS)/gnome-platform-base.spec setup.sh build.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
-echo building gnome-platform-base.spec
rm -rf packages/gnome-platform
mkdir -p packages/gnome-platform
......@@ -77,14 +77,14 @@ $(NOARCH)/gnome-platform-base-0.1-1.noarch.rpm: $(SPECS)/gnome-platform-base.spe
./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
./build.sh rpmbuild -ba $(SPECS)/gnome-platform-base.spec
gnome-sdk-base: $(NOARCH)/gnome-sdk-base-0.1-1.noarch.rpm
gnome-sdk-base: $(NOARCH)/gnome-sdk-base-0.1-1.sdk.noarch.rpm
gnome-platform-packages: $(NOARCH)/gnome-platform-0.1-1.noarch.rpm $(NOARCH)/gnome-platform-base-0.1-1.noarch.rpm setup.sh build.sh
gnome-platform-packages: $(NOARCH)/gnome-platform-0.1-1.sdk.noarch.rpm $(NOARCH)/gnome-platform-base-0.1-1.sdk.noarch.rpm setup.sh build.sh
./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
rm -f gnome-platform-packages
./build.sh ./list_packages.sh gnome-platform > gnome-platform-packages
gnome-platform.tar.gz gnome-platform-rpmdb.tar.gz: gnome-platform-packages $(NOARCH)/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz
gnome-platform.tar.gz gnome-platform-rpmdb.tar.gz: gnome-platform-packages $(NOARCH)/gnome-platform-0.1-1.sdk.noarch.rpm setup.sh build.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz
-echo building gnome-platform
./setup_root.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz
./build.sh rpm -Uvh `cat gnome-platform-packages`
......
......@@ -6,7 +6,7 @@ mkdir -p /tmp/dep
# Generate mapping package name => package name + full version + arch
for spec in $SPECS; do
export spec
bash -c "`rpmspec -q $spec --qf 'echo packages/RPMS/%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.sdk.%{ARCH}.rpm > /tmp/dep/%{NAME}.pkg;'`";
bash -c "`rpmspec -q $spec --qf 'echo packages/RPMS/%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm > /tmp/dep/%{NAME}.pkg;'`";
done
ALL_SOURCES=
......@@ -21,7 +21,7 @@ for spec in $SPECS; do
done
ALL_SOURCES="$ALL_SOURCES $SPEC_SOURCES";
PACKAGES=`rpmspec -q ${spec} --qf 'packages/RPMS/%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.sdk.%{ARCH}.rpm '`
PACKAGES=`rpmspec -q ${spec} --qf 'packages/RPMS/%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm '`
BUILDREQS=`rpmspec -q ${spec} --buildrequires`
BRS=""
for br in $BUILDREQS; do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment